Skip to content

Commit 17ad15d

Browse files
authored
[dynamic control] refactor TYPE to POLICY_TYPE for clarity (#2720)
1 parent fbac60e commit 17ad15d

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import io.opentelemetry.contrib.dynamic.policy.TelemetryPolicy;
99

1010
public final class TraceSamplingRatePolicy extends TelemetryPolicy {
11-
public static final String TYPE = "trace-sampling";
11+
public static final String POLICY_TYPE = "trace-sampling";
1212

1313
private final double probability;
1414

1515
public TraceSamplingRatePolicy(double probability) {
16-
super(TYPE);
16+
super(POLICY_TYPE);
1717
if (Double.isNaN(probability) || probability < 0.0 || probability > 1.0) {
1818
throw new IllegalArgumentException("probability must be within [0.0, 1.0]");
1919
}

dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public List<PolicyValidator> getValidators() {
5555
@Override
5656
public void onPoliciesChanged(List<TelemetryPolicy> policies) {
5757
for (TelemetryPolicy policy : policies) {
58-
if (!TraceSamplingRatePolicy.TYPE.equals(policy.getType())) {
58+
if (!TraceSamplingRatePolicy.POLICY_TYPE.equals(policy.getType())) {
5959
continue;
6060
}
6161
if (!(policy instanceof TraceSamplingRatePolicy)) {

dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public final class TraceSamplingValidator extends AbstractSourcePolicyValidator
2121

2222
@Override
2323
public String getPolicyType() {
24-
return TraceSamplingRatePolicy.TYPE;
24+
return TraceSamplingRatePolicy.POLICY_TYPE;
2525
}
2626

2727
@Override

dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/LinePerPolicyFileProviderTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import io.opentelemetry.contrib.dynamic.policy.source.SourceFormat;
1111
import io.opentelemetry.contrib.dynamic.policy.source.SourceWrapper;
12+
import io.opentelemetry.contrib.dynamic.policy.tracesampling.TraceSamplingRatePolicy;
1213
import java.io.IOException;
1314
import java.nio.file.Files;
1415
import java.nio.file.Path;
@@ -20,7 +21,7 @@
2021

2122
class LinePerPolicyFileProviderTest {
2223

23-
private static final String TRACE_SAMPLING_TYPE = "trace-sampling";
24+
private static final String TRACE_SAMPLING_TYPE = TraceSamplingRatePolicy.POLICY_TYPE;
2425

2526
@TempDir Path tempDir;
2627

dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingRatePolicyImplementerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ void typeOnlyTraceSamplingPolicyFallsBackToAlwaysOn() {
2828
TraceSamplingRatePolicyImplementer implementer =
2929
new TraceSamplingRatePolicyImplementer(delegatingSampler);
3030

31-
implementer.onPoliciesChanged(singletonList(new TelemetryPolicy("trace-sampling")));
31+
implementer.onPoliciesChanged(
32+
singletonList(new TelemetryPolicy(TraceSamplingRatePolicy.POLICY_TYPE)));
3233

3334
assertThat(decisionFor(delegatingSampler)).isEqualTo(SamplingDecision.RECORD_AND_SAMPLE);
3435
}

dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/TraceSamplingValidatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
class TraceSamplingValidatorTest {
2020

21-
private static final String TRACE_SAMPLING_POLICY_TYPE = TraceSamplingRatePolicy.TYPE;
21+
private static final String TRACE_SAMPLING_POLICY_TYPE = TraceSamplingRatePolicy.POLICY_TYPE;
2222

2323
private final TraceSamplingValidator validator = new TraceSamplingValidator();
2424

0 commit comments

Comments
 (0)