diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts index 5bd3b491c..5f1d8eaf0 100644 --- a/custom/build.gradle.kts +++ b/custom/build.gradle.kts @@ -31,11 +31,6 @@ dependencies { compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") compileOnly(libs.bundles.semconv) - implementation(libs.contribConsistentSampling) { - // exclude transitive dependency as it's provided through agent packaging - exclude(group = "io.opentelemetry", module = "opentelemetry-sdk-trace") - exclude(group = "io.opentelemetry", module = "opentelemetry-sdk-extension-autoconfigure-spi") - } implementation(libs.contribSpanStacktrace) { // exclude transitive dependency as it's provided through agent packaging exclude(group = "io.opentelemetry", module = "opentelemetry-sdk") diff --git a/custom/src/main/java/co/elastic/otel/compositesampling/DynamicCompositeParentBasedTraceIdRatioBasedSampler.java b/custom/src/main/java/co/elastic/otel/compositesampling/DynamicCompositeParentBasedTraceIdRatioBasedSampler.java index 6135135f5..87214de62 100644 --- a/custom/src/main/java/co/elastic/otel/compositesampling/DynamicCompositeParentBasedTraceIdRatioBasedSampler.java +++ b/custom/src/main/java/co/elastic/otel/compositesampling/DynamicCompositeParentBasedTraceIdRatioBasedSampler.java @@ -21,7 +21,8 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; -import io.opentelemetry.contrib.sampler.consistent56.ConsistentSampler; +import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler; +import io.opentelemetry.sdk.extension.incubator.trace.samplers.CompositeSampler; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.SamplingResult; @@ -57,7 +58,8 @@ public String getDescription() { private static Sampler newSampler(double ratio) { latestRatio = ratio; - return ConsistentSampler.parentBased(ConsistentSampler.probabilityBased(ratio)); + return CompositeSampler.wrap( + ComposableSampler.parentThreshold(ComposableSampler.probability(ratio))); } public String toString() {