Merge pull request #4682 from DataDog/ygree/drop-dm-tag-for-sss

Do not add the `_dd.p.dm` tag for spans selected by SSS.
DataDog · Feb 7, 2023 · 453ff49 · 453ff49
2 parents b4d2c64 + d001522
commit 453ff49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
@@ -392,8 +392,6 @@ public void setSpanSamplingPriority(double rate, int limit) {
       if (limit != Integer.MAX_VALUE) {
         unsafeSetTag(SPAN_SAMPLING_MAX_PER_SECOND_TAG, limit);
       }
-      propagationTags.updateTraceSamplingPriority(
-          PrioritySampling.USER_KEEP, SamplingMechanism.SPAN_SAMPLING_RATE);
       isSelectedBySingleSpanSampling = true;
     }
   }

diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy
@@ -229,7 +229,8 @@ class DDSpanContextTest extends DDCoreSpecification {
     // single span sampling should not change the trace sampling priority
     context.getSamplingPriority() == UNSET
     context.effectiveSamplingPriority == USER_KEEP
-    context.getPropagationTags().createTagMap() == ["_dd.p.dm":"-" + SPAN_SAMPLING_RATE]
+    // make sure the `_dd.p.dm` tag has not been set by single span sampling
+    context.getPropagationTags().createTagMap() == [:]
 
     where:
     rate | limit