move W3CTraceParent utility to core package instead of public API

Author: na-ji

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java

@@ -9,7 +9,6 @@
 
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTraceId;
-import datadog.trace.api.W3CTraceParent;
 import datadog.trace.api.naming.SpanNaming;
 import datadog.trace.api.telemetry.LogCollector;
 import datadog.trace.bootstrap.ContextStore;
@@ -23,6 +22,7 @@
 import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
 import datadog.trace.bootstrap.instrumentation.jdbc.DBQueryInfo;
 import datadog.trace.bootstrap.instrumentation.jdbc.JDBCConnectionUrlParser;
+import datadog.trace.core.propagation.W3CTraceParent;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.sql.Connection;

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java

@@ -17,13 +17,13 @@
 import datadog.appsec.api.blocking.BlockingException;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
-import datadog.trace.api.W3CTraceParent;
 import datadog.trace.bootstrap.CallDepthThreadLocalMap;
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
+import datadog.trace.core.propagation.W3CTraceParent;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;

dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java

@@ -4,9 +4,9 @@
 import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DBM_TRACE_INJECTED;
 
 import datadog.trace.api.Config;
-import datadog.trace.api.W3CTraceParent;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter;
+import datadog.trace.core.propagation.W3CTraceParent;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonString;

dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java

@@ -16,7 +16,6 @@
 import datadog.trace.api.DDTraceId;
 import datadog.trace.api.TraceConfig;
 import datadog.trace.api.TracePropagationStyle;
-import datadog.trace.api.W3CTraceParent;
 import datadog.trace.api.internal.util.LongStringUtils;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.api.sampling.SamplingMechanism;

…va/datadog/trace/api/W3CTraceParent.java …ace/core/propagation/W3CTraceParent.javadd-trace-api/src/main/java/datadog/trace/api/W3CTraceParent.java renamed to dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CTraceParent.java dd-trace-api/src/main/java/datadog/trace/api/W3CTraceParent.java renamed to dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CTraceParent.java

@@ -1,4 +1,7 @@
-package datadog.trace.api;
+package datadog.trace.core.propagation;
+
+import datadog.trace.api.DDSpanId;
+import datadog.trace.api.DDTraceId;
 
 /**
  * Utility class for building W3C traceparent headers.

…adog/trace/api/W3CTraceParentTest.groovy …re/propagation/W3CTraceParentTest.groovydd-trace-api/src/test/groovy/datadog/trace/api/W3CTraceParentTest.groovy renamed to dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CTraceParentTest.groovy dd-trace-api/src/test/groovy/datadog/trace/api/W3CTraceParentTest.groovy renamed to dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CTraceParentTest.groovy

@@ -1,12 +1,13 @@
-package datadog.trace.api
+package datadog.trace.core.propagation
 
+import datadog.trace.api.DDTraceId
 import datadog.trace.test.util.DDSpecification
 
 class W3CTraceParentTest extends DDSpecification {
 
   def "build produces correct format with samplingPriority=#samplingPriority"() {
     when:
-    def result = W3CTraceParent.build(traceId, spanId, samplingPriority)
+    def result = W3CTraceParent.from(traceId, spanId, samplingPriority)
 
     then:
     result == expected
@@ -23,7 +24,7 @@ class W3CTraceParentTest extends DDSpecification {
 
   def "build matches W3C traceparent format"() {
     when:
-    def result = W3CTraceParent.build(DDTraceId.from(123456789L), 987654321L, 1)
+    def result = W3CTraceParent.from(DDTraceId.from(123456789L), 987654321L, 1)
 
     then:
     // W3C format: version-traceId(32 hex)-spanId(16 hex)-flags(2 hex)