Fix tests and corner cases

amarziali · amarziali · commit cb724edfe1b2 · 2026-03-02T10:57:50.000+01:00
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
@@ -68,6 +68,7 @@
 import datadog.trace.bootstrap.instrumentation.api.SpanAttributes;
 import datadog.trace.bootstrap.instrumentation.api.SpanLink;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
+import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.civisibility.interceptor.CiVisibilityApmProtocolInterceptor;
 import datadog.trace.civisibility.interceptor.CiVisibilityTelemetryInterceptor;
 import datadog.trace.civisibility.interceptor.CiVisibilityTraceInterceptor;
@@ -2074,6 +2075,9 @@ protected static final DDSpanContext buildSpanContext(
       context.setAllTags(coreTags, coreTagsNeedsIntercept);
       context.setAllTags(rootSpanTags, rootSpanTagsNeedsIntercept);
       context.setAllTags(contextualTags);
+      // remove version here since will be done later on the postProcessor.
+      // it will allow knowing if it will be set manually or not
+      context.removeTag(Tags.VERSION);
       return context;
     }
   }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java
@@ -16,7 +16,7 @@ public final class InternalTagsAdder extends TagsPostProcessor {
 
   public InternalTagsAdder(@Nullable final String ddService, @Nullable final String version) {
     this.ddService = ddService != null ? UTF8BytesString.create(ddService) : null;
-    this.version = version != null ? UTF8BytesString.create(version) : null;
+    this.version = version != null && !version.isEmpty() ? UTF8BytesString.create(version) : null;
   }
 
   @Override
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactory.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/TagsPostProcessorFactory.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 public final class TagsPostProcessorFactory {
-  private static boolean addBaseService = true;
+  private static boolean addInternalTags = true;
   private static boolean addRemoteHostname = true;
 
   private static class Lazy {
@@ -15,7 +15,7 @@ private static class Lazy {
     private static TagsPostProcessor createEagerChain() {
       final List<TagsPostProcessor> processors = new ArrayList<>(3);
       processors.add(new PeerServiceCalculator());
-      if (addBaseService) {
+      if (addInternalTags) {
         processors.add(
             new InternalTagsAdder(Config.get().getServiceName(), Config.get().getVersion()));
       }
@@ -67,8 +67,8 @@ public static TagsPostProcessor lazyProcessor() {
    *
    * @param enabled if false, {@link InternalTagsAdder} is not put in the chain.
    */
-  public static void withAddBaseService(boolean enabled) {
-    addBaseService = enabled;
+  public static void withAddInternalTags(boolean enabled) {
+    addInternalTags = enabled;
     Lazy.eagerProcessor = Lazy.createEagerChain();
   }
 
@@ -84,7 +84,7 @@ public static void withAddRemoteHostname(boolean enabled) {
 
   /** Used for testing purposes. It reset the singleton and restore default options */
   public static void reset() {
-    withAddBaseService(true);
+    withAddInternalTags(true);
     withAddRemoteHostname(true);
   }
 }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/CoreTracerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/CoreTracerTest.groovy
@@ -476,7 +476,7 @@ class CoreTracerTest extends DDCoreSpecification {
     setup:
     injectSysConfig(SERVICE_NAME, "dd_service_name")
     injectSysConfig(VERSION, "1.0.0")
-    TagsPostProcessorFactory.withAddBaseService(true)
+    TagsPostProcessorFactory.withAddInternalTags(true)
     def tracer = tracerBuilder().writer(new ListWriter()).build()
 
     when:
@@ -491,7 +491,7 @@ class CoreTracerTest extends DDCoreSpecification {
     span2.finish()
     then:
     span2.getServiceName() == "dd_service_name"
-    span2.getTags()["version"] == "1.0.0"
+    span2.getTags()["version"]?.toString() == "1.0.0"
 
     cleanup:
     tracer?.close()
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/test/DDCoreSpecification.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/test/DDCoreSpecification.groovy
@@ -45,7 +45,7 @@ abstract class DDCoreSpecification extends DDSpecification {
 
   @Override
   void setupSpec() {
-    TagsPostProcessorFactory.withAddBaseService(false)
+    TagsPostProcessorFactory.withAddInternalTags(false)
     TagsPostProcessorFactory.withAddRemoteHostname(false)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public final class InternalTagsAdder extends TagsPostProcessor {`
`16`	`16`
`17`	`17`	`public InternalTagsAdder(@Nullable final String ddService, @Nullable final String version) {`
`18`	`18`	`this.ddService = ddService != null ? UTF8BytesString.create(ddService) : null;`
`19`		`- this.version = version != null ? UTF8BytesString.create(version) : null;`
	`19`	`+ this.version = version != null && !version.isEmpty() ? UTF8BytesString.create(version) : null;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ abstract class DDCoreSpecification extends DDSpecification {`
`45`	`45`
`46`	`46`	`@Override`
`47`	`47`	`void setupSpec() {`
`48`		`- TagsPostProcessorFactory.withAddBaseService(false)`
	`48`	`+ TagsPostProcessorFactory.withAddInternalTags(false)`
`49`	`49`	`TagsPostProcessorFactory.withAddRemoteHostname(false)`
`50`	`50`	`}`
`51`	`51`