From 29877c4bc58a7ffaa05b92b64d059b2424e7717f Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Sun, 22 Mar 2026 18:27:56 +0000 Subject: [PATCH] Move SimpleUtf8Cache and GenerationalUtf8Cache so they can be reused for OTLP encoding --- .../java/datadog/communication/serialization}/Caching.java | 2 +- .../communication/serialization}/GenerationalUtf8Cache.java | 3 +-- .../datadog/communication/serialization}/SimpleUtf8Cache.java | 3 +-- .../java/datadog/communication/serialization}/CachingTest.java | 2 +- .../serialization}/GenerationalUtf8CacheTest.java | 2 +- .../communication/serialization}/SimpleUtf8CacheTest.java | 2 +- .../datadog/trace/common/writer/ddagent/Utf8Benchmark.java | 2 ++ .../datadog/trace/common/writer/ddagent/TraceMapperV0_4.java | 2 ++ 8 files changed, 10 insertions(+), 8 deletions(-) rename {dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent => communication/src/main/java/datadog/communication/serialization}/Caching.java (98%) rename {dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent => communication/src/main/java/datadog/communication/serialization}/GenerationalUtf8Cache.java (99%) rename {dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent => communication/src/main/java/datadog/communication/serialization}/SimpleUtf8Cache.java (98%) rename {dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent => communication/src/test/java/datadog/communication/serialization}/CachingTest.java (96%) rename {dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent => communication/src/test/java/datadog/communication/serialization}/GenerationalUtf8CacheTest.java (99%) rename {dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent => communication/src/test/java/datadog/communication/serialization}/SimpleUtf8CacheTest.java (98%) diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/Caching.java b/communication/src/main/java/datadog/communication/serialization/Caching.java similarity index 98% rename from dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/Caching.java rename to communication/src/main/java/datadog/communication/serialization/Caching.java index e9d0534dc9b..868170fcac3 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/Caching.java +++ b/communication/src/main/java/datadog/communication/serialization/Caching.java @@ -1,4 +1,4 @@ -package datadog.trace.common.writer.ddagent; +package datadog.communication.serialization; import java.util.Arrays; diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java b/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java similarity index 99% rename from dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java rename to communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java index 50a80dc6a88..036abfe6e79 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java +++ b/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java @@ -1,6 +1,5 @@ -package datadog.trace.common.writer.ddagent; +package datadog.communication.serialization; -import datadog.communication.serialization.EncodingCache; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.nio.charset.StandardCharsets; diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/SimpleUtf8Cache.java b/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java similarity index 98% rename from dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/SimpleUtf8Cache.java rename to communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java index ab751b6a5ac..bb2dcf11f5d 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/SimpleUtf8Cache.java +++ b/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java @@ -1,6 +1,5 @@ -package datadog.trace.common.writer.ddagent; +package datadog.communication.serialization; -import datadog.communication.serialization.EncodingCache; import java.nio.charset.StandardCharsets; /** diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/CachingTest.java b/communication/src/test/java/datadog/communication/serialization/CachingTest.java similarity index 96% rename from dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/CachingTest.java rename to communication/src/test/java/datadog/communication/serialization/CachingTest.java index 51c6f1d79fe..1ca9cc9b12c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/CachingTest.java +++ b/communication/src/test/java/datadog/communication/serialization/CachingTest.java @@ -1,4 +1,4 @@ -package datadog.trace.common.writer.ddagent; +package datadog.communication.serialization; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/GenerationalUtf8CacheTest.java b/communication/src/test/java/datadog/communication/serialization/GenerationalUtf8CacheTest.java similarity index 99% rename from dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/GenerationalUtf8CacheTest.java rename to communication/src/test/java/datadog/communication/serialization/GenerationalUtf8CacheTest.java index 192608d98d7..b8fb3fde316 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/GenerationalUtf8CacheTest.java +++ b/communication/src/test/java/datadog/communication/serialization/GenerationalUtf8CacheTest.java @@ -1,4 +1,4 @@ -package datadog.trace.common.writer.ddagent; +package datadog.communication.serialization; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/SimpleUtf8CacheTest.java b/communication/src/test/java/datadog/communication/serialization/SimpleUtf8CacheTest.java similarity index 98% rename from dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/SimpleUtf8CacheTest.java rename to communication/src/test/java/datadog/communication/serialization/SimpleUtf8CacheTest.java index c731f362ce3..d07221bd892 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/SimpleUtf8CacheTest.java +++ b/communication/src/test/java/datadog/communication/serialization/SimpleUtf8CacheTest.java @@ -1,4 +1,4 @@ -package datadog.trace.common.writer.ddagent; +package datadog.communication.serialization; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Benchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Benchmark.java index 37d63e9e783..71f309388ab 100644 --- a/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Benchmark.java +++ b/dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/Utf8Benchmark.java @@ -1,5 +1,7 @@ package datadog.trace.common.writer.ddagent; +import datadog.communication.serialization.GenerationalUtf8Cache; +import datadog.communication.serialization.SimpleUtf8Cache; import java.nio.charset.StandardCharsets; import java.util.concurrent.ThreadLocalRandom; import org.openjdk.jmh.annotations.Benchmark; diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java index ed3e5c61ca5..a44ecc6aab1 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java @@ -3,7 +3,9 @@ import static datadog.communication.http.OkHttpUtils.msgpackRequestBodyOf; import datadog.communication.serialization.Codec; +import datadog.communication.serialization.GenerationalUtf8Cache; import datadog.communication.serialization.GrowableBuffer; +import datadog.communication.serialization.SimpleUtf8Cache; import datadog.communication.serialization.Writable; import datadog.communication.serialization.msgpack.MsgPackWriter; import datadog.trace.api.Config;