diff --git a/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicy.java b/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicy.java index 244a4a6d0..e0f5e9f0f 100644 --- a/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicy.java +++ b/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicy.java @@ -8,12 +8,12 @@ import io.opentelemetry.contrib.dynamic.policy.TelemetryPolicy; public final class TraceSamplingRatePolicy extends TelemetryPolicy { - public static final String TYPE = "trace-sampling"; + public static final String POLICY_TYPE = "trace-sampling"; private final double probability; public TraceSamplingRatePolicy(double probability) { - super(TYPE); + super(POLICY_TYPE); if (Double.isNaN(probability) || probability < 0.0 || probability > 1.0) { throw new IllegalArgumentException("probability must be within [0.0, 1.0]"); } diff --git a/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementer.java b/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementer.java index 69c8d9b74..a3fa543a3 100644 --- a/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementer.java +++ b/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementer.java @@ -55,7 +55,7 @@ public List getValidators() { @Override public void onPoliciesChanged(List policies) { for (TelemetryPolicy policy : policies) { - if (!TraceSamplingRatePolicy.TYPE.equals(policy.getType())) { + if (!TraceSamplingRatePolicy.POLICY_TYPE.equals(policy.getType())) { continue; } if (!(policy instanceof TraceSamplingRatePolicy)) { diff --git a/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidator.java b/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidator.java index d7ca991bc..1e60a5106 100644 --- a/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidator.java +++ b/dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidator.java @@ -21,7 +21,7 @@ public final class TraceSamplingValidator extends AbstractSourcePolicyValidator @Override public String getPolicyType() { - return TraceSamplingRatePolicy.TYPE; + return TraceSamplingRatePolicy.POLICY_TYPE; } @Override diff --git a/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/LinePerPolicyFileProviderTest.java b/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/LinePerPolicyFileProviderTest.java index 1f7394d70..a6250ea67 100644 --- a/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/LinePerPolicyFileProviderTest.java +++ b/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/LinePerPolicyFileProviderTest.java @@ -9,6 +9,7 @@ import io.opentelemetry.contrib.dynamic.policy.source.SourceFormat; import io.opentelemetry.contrib.dynamic.policy.source.SourceWrapper; +import io.opentelemetry.contrib.dynamic.policy.tracesampling.TraceSamplingRatePolicy; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -20,7 +21,7 @@ class LinePerPolicyFileProviderTest { - private static final String TRACE_SAMPLING_TYPE = "trace-sampling"; + private static final String TRACE_SAMPLING_TYPE = TraceSamplingRatePolicy.POLICY_TYPE; @TempDir Path tempDir; diff --git a/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementerTest.java b/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementerTest.java index f52b8f1f1..1d24ff630 100644 --- a/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementerTest.java +++ b/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementerTest.java @@ -28,7 +28,8 @@ void typeOnlyTraceSamplingPolicyFallsBackToAlwaysOn() { TraceSamplingRatePolicyImplementer implementer = new TraceSamplingRatePolicyImplementer(delegatingSampler); - implementer.onPoliciesChanged(singletonList(new TelemetryPolicy("trace-sampling"))); + implementer.onPoliciesChanged( + singletonList(new TelemetryPolicy(TraceSamplingRatePolicy.POLICY_TYPE))); assertThat(decisionFor(delegatingSampler)).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE); } diff --git a/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidatorTest.java b/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidatorTest.java index 8d1daaba7..4562ca8f4 100644 --- a/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidatorTest.java +++ b/dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidatorTest.java @@ -18,7 +18,7 @@ class TraceSamplingValidatorTest { - private static final String TRACE_SAMPLING_POLICY_TYPE = TraceSamplingRatePolicy.TYPE; + private static final String TRACE_SAMPLING_POLICY_TYPE = TraceSamplingRatePolicy.POLICY_TYPE; private final TraceSamplingValidator validator = new TraceSamplingValidator();