Restore compliance between code and specs

The Composite Samplers based on Consistent Probability Sampling are described at https://github.com/open-telemetry/opentelemetry-specification/blob/v1.57.0/oteps/trace/0250-Composite_Samplers.md

Author: PeterF778

sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactory.java

@@ -135,7 +135,6 @@ static final class DeclarativeConfigSamplingPredicate implements SamplingPredica
     @Override
     public boolean matches(
         Context parentContext,
-        String traceId,
         String name,
         SpanKind spanKind,
         Attributes attributes,

sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java

@@ -254,7 +254,6 @@ private static Stream<Arguments> createTestCases() {
                       IdGenerator.random().generateSpanId(),
                       TraceFlags.getDefault(),
                       TraceState.getDefault())));
-  private static final String tid = IdGenerator.random().generateTraceId();
   private static final String sn = "name";
   private static final io.opentelemetry.api.trace.SpanKind sk = CLIENT;
   private static final AttributeKey<String> HTTP_ROUTE = AttributeKey.stringKey("http.route");
@@ -268,7 +267,7 @@ void declarativeConfigSamplingPredicate(
       io.opentelemetry.api.trace.SpanKind spanKind,
       Attributes attributes,
       boolean expectedResult) {
-    assertThat(predicate.matches(context, tid, sn, spanKind, attributes, emptyList()))
+    assertThat(predicate.matches(context, sn, spanKind, attributes, emptyList()))
         .isEqualTo(expectedResult);
   }
 

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/ComposableAlwaysOffSampler.java

@@ -19,7 +19,6 @@ enum ComposableAlwaysOffSampler implements ComposableSampler {
   @Override
   public SamplingIntent getSamplingIntent(
       Context parentContext,
-      String traceId,
       String name,
       SpanKind spanKind,
       Attributes attributes,

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/ComposableAlwaysOnSampler.java

@@ -18,14 +18,13 @@ enum ComposableAlwaysOnSampler implements ComposableSampler {
   private static final SamplingIntent INTENT =
       SamplingIntent.create(
           ImmutableSamplingIntent.MIN_THRESHOLD,
-          /* thresholdReliable= */ true,
+          /* adjustedCountReliable= */ true,
           Attributes.empty(),
           Function.identity());
 
   @Override
   public SamplingIntent getSamplingIntent(
       Context parentContext,
-      String traceId,
       String name,
       SpanKind spanKind,
       Attributes attributes,

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/ComposableAnnotatingSampler.java

@@ -27,16 +27,15 @@ final class ComposableAnnotatingSampler implements ComposableSampler {
   @Override
   public SamplingIntent getSamplingIntent(
       Context parentContext,
-      String traceId,
       String name,
       SpanKind spanKind,
       Attributes attributes,
       List<LinkData> parentLinks) {
     SamplingIntent intent =
-        delegate.getSamplingIntent(parentContext, traceId, name, spanKind, attributes, parentLinks);
+        delegate.getSamplingIntent(parentContext, name, spanKind, attributes, parentLinks);
     return SamplingIntent.create(
         intent.getThreshold(),
-        intent.isThresholdReliable(),
+        intent.isAdjustedCountReliable(),
         intent.getAttributes().toBuilder().putAll(this.attributes).build(),
         intent.getTraceStateUpdater());
   }

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/ComposableParentThresholdSampler.java

@@ -31,30 +31,28 @@ final class ComposableParentThresholdSampler implements ComposableSampler {
   @Override
   public SamplingIntent getSamplingIntent(
       Context parentContext,
-      String traceId,
       String name,
       SpanKind spanKind,
       Attributes attributes,
       List<LinkData> parentLinks) {
     SpanContext parentSpanContext = Span.fromContext(parentContext).getSpanContext();
     if (!parentSpanContext.isValid()) {
-      return rootSampler.getSamplingIntent(
-          parentContext, traceId, name, spanKind, attributes, parentLinks);
+      return rootSampler.getSamplingIntent(parentContext, name, spanKind, attributes, parentLinks);
     }
 
     OtelTraceState otTraceState = OtelTraceState.parse(parentSpanContext.getTraceState());
     if (isValidThreshold(otTraceState.getThreshold())) {
       return ImmutableSamplingIntent.create(
           otTraceState.getThreshold(),
-          /* thresholdReliable= */ true,
+          /* adjustedCountReliable= */ true,
           Attributes.empty(),
           Function.identity());
     }
 
     long threshold =
         parentSpanContext.getTraceFlags().isSampled() ? MIN_THRESHOLD : INVALID_THRESHOLD;
     return ImmutableSamplingIntent.create(
-        threshold, /* thresholdReliable= */ false, Attributes.empty(), Function.identity());
+        threshold, /* adjustedCountReliable= */ false, Attributes.empty(), Function.identity());
   }
 
   @Override

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/ComposableProbabilitySampler.java

@@ -33,7 +33,7 @@ private static long calculateThreshold(double ratio) {
       this.intent =
           SamplingIntent.create(
               ImmutableSamplingIntent.INVALID_THRESHOLD,
-              /* thresholdReliable= */ false,
+              /* adjustedCountReliable= */ false,
               Attributes.empty(),
               Function.identity());
     } else {
@@ -43,7 +43,10 @@ private static long calculateThreshold(double ratio) {
 
       this.intent =
           SamplingIntent.create(
-              threshold, /* thresholdReliable= */ true, Attributes.empty(), Function.identity());
+              threshold,
+              /* adjustedCountReliable= */ true,
+              Attributes.empty(),
+              Function.identity());
     }
     this.description =
         "ComposableTraceIdRatioBasedSampler{threshold=" + thresholdStr + ", ratio=" + ratio + "}";
@@ -52,7 +55,6 @@ private static long calculateThreshold(double ratio) {
   @Override
   public SamplingIntent getSamplingIntent(
       Context parentContext,
-      String traceId,
       String name,
       SpanKind spanKind,
       Attributes attributes,

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/ComposableRuleBasedSampler.java

@@ -41,16 +41,14 @@ final class ComposableRuleBasedSampler implements ComposableSampler {
   @Override
   public SamplingIntent getSamplingIntent(
       Context parentContext,
-      String traceId,
       String name,
       SpanKind spanKind,
       Attributes attributes,
       List<LinkData> parentLinks) {
     for (SamplingRule rule : rules) {
-      if (rule.predicate()
-          .matches(parentContext, traceId, name, spanKind, attributes, parentLinks)) {
+      if (rule.predicate().matches(parentContext, name, spanKind, attributes, parentLinks)) {
         return rule.sampler()
-            .getSamplingIntent(parentContext, traceId, name, spanKind, attributes, parentLinks);
+            .getSamplingIntent(parentContext, name, spanKind, attributes, parentLinks);
       }
     }
     return NON_SAMPLING_INTENT;

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/ComposableSampler.java

@@ -56,7 +56,6 @@ static ComposableSampler annotating(ComposableSampler sampler, Attributes attrib
   /** Returns the {@link SamplingIntent} to use to make a sampling decision. */
   SamplingIntent getSamplingIntent(
       Context parentContext,
-      String traceId,
       String name,
       SpanKind spanKind,
       Attributes attributes,

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/samplers/CompositeSampler.java

@@ -53,14 +53,14 @@ public SamplingResult shouldSample(
     OtelTraceState otelTraceState = OtelTraceState.parse(traceState);
 
     SamplingIntent intent =
-        delegate.getSamplingIntent(parentContext, traceId, name, spanKind, attributes, parentLinks);
+        delegate.getSamplingIntent(parentContext, name, spanKind, attributes, parentLinks);
 
-    boolean thresholdReliable = false;
+    boolean adjustedCountReliable = false;
     boolean sampled = false;
     if (isValidThreshold(intent.getThreshold())) {
-      thresholdReliable = intent.isThresholdReliable();
+      adjustedCountReliable = intent.isAdjustedCountReliable();
       long randomValue;
-      if (thresholdReliable) {
+      if (adjustedCountReliable) {
         if (isValidRandomValue(otelTraceState.getRandomValue())) {
           randomValue = otelTraceState.getRandomValue();
         } else {
@@ -75,7 +75,7 @@ public SamplingResult shouldSample(
 
     SamplingDecision decision =
         sampled ? SamplingDecision.RECORD_AND_SAMPLE : SamplingDecision.DROP;
-    if (sampled && thresholdReliable) {
+    if (sampled && adjustedCountReliable) {
       otelTraceState =
           new OtelTraceState(
               otelTraceState.getRandomValue(), intent.getThreshold(), otelTraceState.getRest());