v2: remove deprecated samplingpriority

appsec/appsec.go

@@ -86,7 +86,7 @@ func TrackUserLoginSuccessEvent(ctx context.Context, uid string, md map[string]s
 	for k, v := range md {
 		span.SetTag(tagPrefix+k, v)
 	}
-	span.SetTag(ext.SamplingPriority, ext.PriorityUserKeep)
+	span.SetTag(ext.ManualKeep, true)
 	return SetUser(ctx, uid, opts...)
 }
 
@@ -113,7 +113,7 @@ func TrackUserLoginFailureEvent(ctx context.Context, uid string, exists bool, md
 	for k, v := range md {
 		span.SetTag(tagPrefix+k, v)
 	}
-	span.SetTag(ext.SamplingPriority, ext.PriorityUserKeep)
+	span.SetTag(ext.ManualKeep, true)
 }
 
 // TrackCustomEvent sets a custom event as service entry span tags. This span is
@@ -130,7 +130,7 @@ func TrackCustomEvent(ctx context.Context, name string, md map[string]string) {
 
 	tagPrefix := "appsec.events." + name + "."
 	span.SetTag(tagPrefix+"track", true)
-	span.SetTag(ext.SamplingPriority, ext.PriorityUserKeep)
+	span.SetTag(ext.ManualKeep, true)
 	for k, v := range md {
 		span.SetTag(tagPrefix+k, v)
 	}

contrib/dimfeld/httptreemux.v5/example_test.go

@@ -43,7 +43,7 @@ func Example_withSpanOpts() {
 	router := httptrace.New(
 		httptrace.WithService("http.router"),
 		httptrace.WithSpanOptions(
-			tracer.Tag(ext.SamplingPriority, ext.PriorityUserKeep),
+			tracer.Tag(ext.ManualKeep, true),
 		),
 	)
 

contrib/gorilla/mux/mux_test.go

@@ -224,7 +224,7 @@ func TestSpanOptions(t *testing.T) {
 	assert := assert.New(t)
 	mt := mocktracer.Start()
 	defer mt.Stop()
-	mux := NewRouter(WithSpanOptions(tracer.Tag(ext.SamplingPriority, 2)))
+	mux := NewRouter(WithSpanOptions(tracer.Tag(ext.ManualKeep, true)))
 	mux.Handle("/200", okHandler()).Host("localhost")
 	r := httptest.NewRequest("GET", "http://localhost/200", nil)
 	w := httptest.NewRecorder()

contrib/julienschmidt/httprouter/example_test.go

@@ -45,7 +45,7 @@ func Example_withSpanOpts() {
 	router := httptrace.New(
 		httptrace.WithService("http.router"),
 		httptrace.WithSpanOptions(
-			tracer.Tag(ext.SamplingPriority, ext.PriorityUserKeep),
+			tracer.Tag(ext.ManualKeep, true),
 		),
 	)
 

ddtrace/ext/tags.go

@@ -25,10 +25,6 @@ const (
 	// NetworkDestinationPort is the remote port number of the outbound connection.
 	NetworkDestinationPort = "network.destination.port"
 
-	// SamplingPriority is the tag that marks the sampling priority of a span.
-	// Deprecated in favor of ManualKeep and ManualDrop.
-	SamplingPriority = "sampling.priority"
-
 	// SQLType sets the sql type tag.
 	SQLType = "sql"
 

ddtrace/mocktracer/mocktracer_test.go

@@ -30,7 +30,7 @@ func TestTracerStop(t *testing.T) {
 }
 
 func TestTracerStartSpan(t *testing.T) {
-	parentTags := map[string]interface{}{ext.ServiceName: "root-service", ext.SamplingPriority: -1}
+	parentTags := map[string]interface{}{ext.ServiceName: "root-service", ext.ManualDrop: true}
 	// Need to round the monotonic clock so parsed UnixNano values are equal.
 	// See time.Time documentation for details:
 	// https://pkg.go.dev/time#Time
@@ -53,9 +53,6 @@ func TestTracerStartSpan(t *testing.T) {
 		assert.Equal("my-service", s.Tag(ext.ServiceName))
 		assert.Equal(parent.SpanID(), s.ParentID())
 		assert.Equal(parent.TraceID(), s.TraceID())
-		sp, ok := parent.Context().SamplingPriority()
-		assert.True(ok)
-		assert.Equal(-1, sp)
 	})
 
 	t.Run("inherit", func(t *testing.T) {
@@ -71,7 +68,7 @@ func TestTracerStartSpan(t *testing.T) {
 		assert.Equal(parent.TraceID(), s.TraceID())
 		sp, ok := parent.Context().SamplingPriority()
 		assert.True(ok)
-		assert.Equal(-1, sp)
+		assert.Equal(1, sp)
 	})
 }
 

ddtrace/tracer/remote_config_test.go

@@ -73,7 +73,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
 		s = tracer.StartSpan("not.web.request")
 		s.Finish()
 		require.Equal(t, 0.5, s.metrics[keyRulesSamplerAppliedRate])
-		if p, ok := s.context.trace.samplingPriority(); ok && p > 0 {
+		if p, ok := s.context.trace.samplingPriority(); ok && p > int(decisionDrop) {
 			require.Equal(t, samplerToDM(samplernames.RuleRate), s.context.trace.propagatingTags[keyDecisionMaker])
 		}
 
@@ -162,7 +162,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
 		s := tracer.StartSpan("web.request")
 		s.Finish()
 		require.Equal(t, 0.1, s.metrics[keyRulesSamplerAppliedRate])
-		if p, ok := s.context.trace.samplingPriority(); ok && p > 0 {
+		if p, ok := s.context.trace.samplingPriority(); ok && p > int(decisionDrop) {
 			require.Equal(t, samplerToDM(samplernames.RuleRate), s.context.trace.propagatingTags[keyDecisionMaker])
 		}
 
@@ -189,7 +189,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
 		s.resource = "not_abc"
 		s.Finish()
 		require.Equal(t, 0.5, s.metrics[keyRulesSamplerAppliedRate])
-		if p, ok := s.context.trace.samplingPriority(); ok && p > 0 {
+		if p, ok := s.context.trace.samplingPriority(); ok && p > int(decisionDrop) {
 			require.Equal(t, samplerToDM(samplernames.RuleRate), s.context.trace.propagatingTags[keyDecisionMaker])
 		}
 
@@ -222,7 +222,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
 		s := tracer.StartSpan("web.request")
 		s.Finish()
 		require.Equal(t, 0.1, s.metrics[keyRulesSamplerAppliedRate])
-		if p, ok := s.context.trace.samplingPriority(); ok && p > 0 {
+		if p, ok := s.context.trace.samplingPriority(); ok && p > int(decisionDrop) {
 			require.Equal(t, samplerToDM(samplernames.RuleRate), s.context.trace.propagatingTags[keyDecisionMaker])
 		}
 
@@ -256,7 +256,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
 		s.resource = "not_abc"
 		s.Finish()
 		require.Equal(t, 0.3, s.metrics[keyRulesSamplerAppliedRate])
-		if p, ok := s.context.trace.samplingPriority(); ok && p > 0 {
+		if p, ok := s.context.trace.samplingPriority(); ok && p > int(decisionDrop) {
 			require.Equal(
 				t,
 				samplerToDM(samplernames.RemoteDynamicRule),
@@ -272,7 +272,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
 		s.resource = "not_abc"
 		s.Finish()
 		require.Equal(t, 0.1, s.metrics[keyRulesSamplerAppliedRate])
-		if p, ok := s.context.trace.samplingPriority(); ok && p > 0 {
+		if p, ok := s.context.trace.samplingPriority(); ok && p > int(decisionDrop) {
 			require.Equal(t, samplerToDM(samplernames.RuleRate), s.context.trace.propagatingTags[keyDecisionMaker])
 		}
 		telemetryClient.AssertNumberOfCalls(t, "ConfigChange", 2)

ddtrace/tracer/rules_sampler.go

@@ -16,7 +16,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/DataDog/dd-trace-go/v2/ddtrace/ext"
 	"github.com/DataDog/dd-trace-go/v2/internal/log"
 	"github.com/DataDog/dd-trace-go/v2/internal/samplernames"
 
@@ -487,15 +486,15 @@ func (rs *traceRulesSampler) applyRate(span *Span, rate float64, now time.Time,
 	span.setMetric(keyRulesSamplerAppliedRate, rate)
 	delete(span.metrics, keySamplingPriorityRate)
 	if !sampledByRate(span.traceID, rate) {
-		span.setSamplingPriorityLocked(ext.PriorityUserReject, sampler)
+		span.setSamplingPriorityLocked(int(decisionDrop), sampler)
 		return
 	}
 
 	sampled, rate := rs.limiter.allowOne(now)
 	if sampled {
-		span.setSamplingPriorityLocked(ext.PriorityUserKeep, sampler)
+		span.setSamplingPriorityLocked(int(decisionKeep), sampler)
 	} else {
-		span.setSamplingPriorityLocked(ext.PriorityUserReject, sampler)
+		span.setSamplingPriorityLocked(int(decisionDrop), sampler)
 	}
 	span.setMetric(keyRulesSamplerLimiterRate, rate)
 }

ddtrace/tracer/sampler.go

@@ -164,9 +164,9 @@ func (ps *prioritySampler) getRate(spn *Span) float64 {
 func (ps *prioritySampler) apply(spn *Span) {
 	rate := ps.getRate(spn)
 	if sampledByRate(spn.traceID, rate) {
-		spn.setSamplingPriority(ext.PriorityAutoKeep, samplernames.AgentRate)
+		spn.setSamplingPriority(int(decisionKeep), samplernames.AgentRate)
 	} else {
-		spn.setSamplingPriority(ext.PriorityAutoReject, samplernames.AgentRate)
+		spn.setSamplingPriority(int(decisionDrop), samplernames.AgentRate)
 	}
 	spn.SetTag(keySamplingPriorityRate, rate)
 }

ddtrace/tracer/sampler_test.go

@@ -154,17 +154,17 @@ func TestPrioritySampler(t *testing.T) {
 		testSpan1.traceID = math.MaxUint64 - (math.MaxUint64 / 4)
 
 		ps.apply(testSpan1)
-		assert.EqualValues(ext.PriorityAutoKeep, testSpan1.metrics[keySamplingPriority])
+		assert.EqualValues(int(decisionKeep), testSpan1.metrics[keySamplingPriority])
 		assert.EqualValues(0.5, testSpan1.metrics[keySamplingPriorityRate])
 
 		testSpan1.traceID = math.MaxUint64 - (math.MaxUint64 / 3)
 		ps.apply(testSpan1)
-		assert.EqualValues(ext.PriorityAutoReject, testSpan1.metrics[keySamplingPriority])
+		assert.EqualValues(int(decisionDrop), testSpan1.metrics[keySamplingPriority])
 		assert.EqualValues(0.5, testSpan1.metrics[keySamplingPriorityRate])
 
 		testSpan1.service = "other-service"
 		testSpan1.traceID = 1
-		assert.EqualValues(ext.PriorityAutoReject, testSpan1.metrics[keySamplingPriority])
+		assert.EqualValues(int(decisionDrop), testSpan1.metrics[keySamplingPriority])
 		assert.EqualValues(0.5, testSpan1.metrics[keySamplingPriorityRate])
 	})
 }
@@ -1012,7 +1012,7 @@ func TestRulesSampler(t *testing.T) {
 					result = rs.SampleTraceGlobalRate(span)
 					assert.True(result)
 					assert.Equal(rate, span.metrics[keyRulesSamplerAppliedRate])
-					if rate > 0.0 && (span.metrics[keySamplingPriority] != ext.PriorityUserReject) {
+					if rate > 0.0 && (span.metrics[keySamplingPriority] != float64(decisionDrop)) {
 						assert.Equal(1.0, span.metrics[keyRulesSamplerLimiterRate])
 					}
 				})
@@ -1033,25 +1033,25 @@ func TestRulesSampler(t *testing.T) {
 			{
 				rules:            `[{"tags": {"tag1": "non-matching"}, "sample_rate": 0}, {"resource": "/bar", "sample_rate": 1}]`,
 				generalRate:      "0",
-				samplingPriority: 2,
+				samplingPriority: float64(decisionKeep),
 				appliedRate:      1,
 			},
 			{
 				rules:            `[{"tags": {"tag1": "non-matching"}, "sample_rate": 0}, {"tags": {"tag1": "val1"}, "sample_rate": 1}]`,
 				generalRate:      "0",
-				samplingPriority: 2,
+				samplingPriority: float64(decisionKeep),
 				appliedRate:      1,
 			},
 			{
 				rules:            `[ {"tags": {"tag1": "val1"}, "sample_rate": 0}]`,
 				generalRate:      "1",
-				samplingPriority: -1,
+				samplingPriority: float64(decisionDrop),
 				appliedRate:      0,
 			},
 			{
 				rules:            `  [{"service": "webserver", "name": "web.request", "sample_rate": 0}]`,
 				generalRate:      "1",
-				samplingPriority: -1,
+				samplingPriority: float64(decisionDrop),
 				appliedRate:      0,
 			},
 		}
@@ -1089,7 +1089,7 @@ func TestRulesSampler(t *testing.T) {
 		originSpan.SetTag("tag1", "val1")
 		// based on the  Tag("tag0", "val0") start span option, span sampling would be 'drop',
 		// and setting the second pair of tags doesn't invoke sampling func
-		assert.EqualValues(t, -1, originSpan.metrics[keySamplingPriority])
+		assert.EqualValues(t, float64(decisionDrop), originSpan.metrics[keySamplingPriority])
 		assert.EqualValues(t, 0, originSpan.metrics[keyRulesSamplerAppliedRate])
 		headers := TextMapCarrier(map[string]string{})
 
@@ -1320,12 +1320,12 @@ func TestRulesSamplerInternals(t *testing.T) {
 		// first span kept, second dropped
 		span := makeSpanAt("http.request", "test-service", now)
 		rs.traces.applyRate(span, 1.0, now, samplernames.RuleRate)
-		assert.EqualValues(ext.PriorityUserKeep, span.metrics[keySamplingPriority])
+		assert.EqualValues(int(decisionKeep), span.metrics[keySamplingPriority])
 		assert.Equal(1.0, span.metrics[keyRulesSamplerAppliedRate])
 		assert.Equal(1.0, span.metrics[keyRulesSamplerLimiterRate])
 		span = makeSpanAt("http.request", "test-service", now)
 		rs.traces.applyRate(span, 1.0, now, samplernames.RuleRate)
-		assert.EqualValues(ext.PriorityUserReject, span.metrics[keySamplingPriority])
+		assert.EqualValues(int(decisionDrop), span.metrics[keySamplingPriority])
 		assert.Equal(1.0, span.metrics[keyRulesSamplerAppliedRate])
 		assert.Equal(0.75, span.metrics[keyRulesSamplerLimiterRate])
 	})

ddtrace/tracer/span.go

@@ -257,7 +257,7 @@ func (s *Span) AddLink(spanContext *SpanContext, attributes map[string]string) {
 
 	samplingDecision, hasSamplingDecision := spanContext.SamplingPriority()
 	var flags uint32
-	if hasSamplingDecision && samplingDecision >= ext.PriorityAutoKeep {
+	if hasSamplingDecision && samplingDecision >= int(decisionKeep) {
 		flags = uint32(1<<31 | 1)
 	} else if hasSamplingDecision {
 		flags = uint32(1<<31 | 0)
@@ -503,11 +503,11 @@ func (s *Span) setTagBool(key string, v bool) {
 		}
 	case ext.ManualDrop:
 		if v {
-			s.setSamplingPriorityLocked(ext.PriorityUserReject, samplernames.Manual)
+			s.setSamplingPriorityLocked(int(decisionDrop), samplernames.Manual)
 		}
 	case ext.ManualKeep:
 		if v {
-			s.setSamplingPriorityLocked(ext.PriorityUserKeep, samplernames.Manual)
+			s.setSamplingPriorityLocked(int(decisionKeep), samplernames.Manual)
 		}
 	default:
 		if v {
@@ -528,12 +528,8 @@ func (s *Span) setMetric(key string, v float64) {
 	switch key {
 	case ext.ManualKeep:
 		if v == float64(samplernames.AppSec) {
-			s.setSamplingPriorityLocked(ext.PriorityUserKeep, samplernames.AppSec)
+			s.setSamplingPriorityLocked(int(decisionKeep), samplernames.AppSec)
 		}
-	case ext.SamplingPriority:
-		// ext.SamplingPriority is deprecated in favor of ext.ManualKeep and ext.ManualDrop.
-		// We have it here for backward compatibility.
-		s.setSamplingPriorityLocked(int(v), samplernames.Manual)
 	default:
 		s.metrics[key] = v
 	}
@@ -722,7 +718,7 @@ func obfuscatedResource(o *obfuscate.Obfuscator, typ, resource string) string {
 // shouldKeep reports whether the trace should be kept.
 // a single span being kept implies the whole trace being kept.
 func shouldKeep(s *Span) bool {
-	if p, ok := s.context.SamplingPriority(); ok && p > 0 {
+	if p, ok := s.context.SamplingPriority(); ok && p >= int(decisionKeep) {
 		// positive sampling priorities stay
 		return true
 	}