diff --git a/dd-trace-api/src/main/java/datadog/trace/api/sampling/PrioritySampling.java b/dd-trace-api/src/main/java/datadog/trace/api/sampling/PrioritySampling.java new file mode 100644 index 00000000000..2596e734bc8 --- /dev/null +++ b/dd-trace-api/src/main/java/datadog/trace/api/sampling/PrioritySampling.java @@ -0,0 +1,20 @@ +package datadog.trace.api.sampling; + +public class PrioritySampling { + /** + * Implementation detail of the client. will not be sent to the agent or propagated. + * + *
Internal value used when the priority sampling flag has not been set on the span context. + */ + public static final int UNSET = Integer.MIN_VALUE; + /** The sampler has decided to drop the trace. */ + public static final int SAMPLER_DROP = 0; + /** The sampler has decided to keep the trace. */ + public static final int SAMPLER_KEEP = 1; + /** The user has decided to drop the trace. */ + public static final int USER_DROP = -1; + /** The user has decided to keep the trace. */ + public static final int USER_KEEP = 2; + + private PrioritySampling() {} +} diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java index 5e43123f7ca..fa979c6912c 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import datadog.trace.api.DDTags; import datadog.trace.api.interceptor.MutableSpan; -import datadog.trace.common.sampling.PrioritySampling; +import datadog.trace.api.sampling.PrioritySampling; import datadog.trace.common.util.Clock; import io.opentracing.Span; import java.io.PrintWriter; diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java index 284ff01ee4f..0407f2ce536 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDSpanContext.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import datadog.opentracing.decorators.AbstractDecorator; import datadog.trace.api.DDTags; -import datadog.trace.common.sampling.PrioritySampling; +import datadog.trace.api.sampling.PrioritySampling; import io.opentracing.tag.Tags; import java.util.Collections; import java.util.List; diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java index a712af1e20e..4b4ea6b1cb2 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java @@ -13,10 +13,10 @@ import datadog.trace.api.DDTags; import datadog.trace.api.interceptor.MutableSpan; import datadog.trace.api.interceptor.TraceInterceptor; +import datadog.trace.api.sampling.PrioritySampling; import datadog.trace.common.DDTraceConfig; import datadog.trace.common.Service; import datadog.trace.common.sampling.AllSampler; -import datadog.trace.common.sampling.PrioritySampling; import datadog.trace.common.sampling.RateByServiceSampler; import datadog.trace.common.sampling.Sampler; import datadog.trace.common.writer.DDAgentWriter; diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/propagation/HTTPCodec.java b/dd-trace-ot/src/main/java/datadog/opentracing/propagation/HTTPCodec.java index 942448fff35..40591a7a094 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/propagation/HTTPCodec.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/propagation/HTTPCodec.java @@ -1,7 +1,7 @@ package datadog.opentracing.propagation; import datadog.opentracing.DDSpanContext; -import datadog.trace.common.sampling.PrioritySampling; +import datadog.trace.api.sampling.PrioritySampling; import io.opentracing.propagation.TextMap; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/dd-trace-ot/src/main/java/datadog/trace/common/sampling/PrioritySampling.java b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/PrioritySampling.java index aca9c678524..18446bcdfe0 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/common/sampling/PrioritySampling.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/PrioritySampling.java @@ -1,5 +1,7 @@ package datadog.trace.common.sampling; +/** @deprecated Replaced by {@link datadog.trace.api.sampling.PrioritySampling} . */ +@Deprecated public class PrioritySampling { /** * Implementation detail of the client. will not be sent to the agent or propagated. diff --git a/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateByServiceSampler.java b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateByServiceSampler.java index 0287d8d56a3..2ae24703b5b 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateByServiceSampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateByServiceSampler.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import datadog.opentracing.DDSpan; +import datadog.trace.api.sampling.PrioritySampling; import datadog.trace.common.writer.DDApi.ResponseListener; import java.util.HashMap; import java.util.Iterator; diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanSerializationTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanSerializationTest.groovy index 1c35d641bce..7d36ee982c3 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanSerializationTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanSerializationTest.groovy @@ -3,7 +3,7 @@ package datadog.opentracing import com.fasterxml.jackson.databind.ObjectMapper import com.google.common.collect.Maps import datadog.trace.api.DDTags -import datadog.trace.common.sampling.PrioritySampling +import datadog.trace.api.sampling.PrioritySampling import datadog.trace.common.writer.ListWriter import spock.lang.Specification import spock.lang.Timeout diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanTest.groovy index fa10e49531a..db8a734071d 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/DDSpanTest.groovy @@ -1,6 +1,6 @@ package datadog.opentracing -import datadog.trace.common.sampling.PrioritySampling +import datadog.trace.api.sampling.PrioritySampling import datadog.trace.common.writer.ListWriter import spock.lang.Specification import spock.lang.Timeout diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/SpanFactory.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/SpanFactory.groovy index f33d93bdf2a..207e0d62bbf 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/SpanFactory.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/SpanFactory.groovy @@ -1,6 +1,6 @@ package datadog.opentracing -import datadog.trace.common.sampling.PrioritySampling +import datadog.trace.api.sampling.PrioritySampling import datadog.trace.common.writer.ListWriter class SpanFactory { diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy index aa273fb1b43..6074b5a1752 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/URLAsResourceNameTest.groovy @@ -3,7 +3,7 @@ package datadog.opentracing.decorators import datadog.opentracing.DDSpanContext import datadog.opentracing.DDTracer import datadog.opentracing.PendingTrace -import datadog.trace.common.sampling.PrioritySampling +import datadog.trace.api.sampling.PrioritySampling import datadog.trace.common.writer.ListWriter import io.opentracing.tag.Tags import spock.lang.Specification diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/propagation/HTTPCodecTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/propagation/HTTPCodecTest.groovy index e2a2491da16..04cb302b5bd 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/propagation/HTTPCodecTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/propagation/HTTPCodecTest.groovy @@ -3,7 +3,7 @@ package datadog.opentracing.propagation import datadog.opentracing.DDSpanContext import datadog.opentracing.DDTracer import datadog.opentracing.PendingTrace -import datadog.trace.common.sampling.PrioritySampling +import datadog.trace.api.sampling.PrioritySampling import datadog.trace.common.writer.ListWriter import io.opentracing.propagation.TextMapExtractAdapter import io.opentracing.propagation.TextMapInjectAdapter diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy index 93afde98597..20a69dccd61 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy @@ -3,7 +3,6 @@ package datadog.trace.api.sampling import com.fasterxml.jackson.databind.ObjectMapper import datadog.opentracing.DDSpan import datadog.opentracing.SpanFactory -import datadog.trace.common.sampling.PrioritySampling import datadog.trace.common.sampling.RateByServiceSampler import spock.lang.Specification import spock.lang.Timeout diff --git a/dd-trace-ot/src/traceAgentTest/groovy/DDApiIntegrationTest.groovy b/dd-trace-ot/src/traceAgentTest/groovy/DDApiIntegrationTest.groovy index 3d02a8059ae..7451f673640 100644 --- a/dd-trace-ot/src/traceAgentTest/groovy/DDApiIntegrationTest.groovy +++ b/dd-trace-ot/src/traceAgentTest/groovy/DDApiIntegrationTest.groovy @@ -4,7 +4,7 @@ import datadog.opentracing.DDSpanContext import datadog.opentracing.DDTracer import datadog.opentracing.PendingTrace import datadog.trace.common.Service -import datadog.trace.common.sampling.PrioritySampling +import datadog.trace.api.sampling.PrioritySampling import datadog.trace.common.writer.DDAgentWriter import datadog.trace.common.writer.DDApi import datadog.trace.common.writer.ListWriter