Skip to content

Commit e17761e

Browse files
authored
[dynamic control] refactor trace sampling into specific subpackage (#2698)
1 parent e2646ac commit e17761e

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/sampler/DelegatingSampler.java renamed to dynamic-control/src/main/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/DelegatingSampler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.contrib.dynamic.sampler;
6+
package io.opentelemetry.contrib.dynamic.policy.tracesampling;
77

88
import io.opentelemetry.api.common.Attributes;
99
import io.opentelemetry.api.trace.SpanKind;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.contrib.dynamic.policy;
6+
package io.opentelemetry.contrib.dynamic.policy.tracesampling;
7+
8+
import io.opentelemetry.contrib.dynamic.policy.TelemetryPolicy;
79

810
public final class TraceSamplingRatePolicy extends TelemetryPolicy {
911
public static final String TYPE = "trace-sampling";

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.contrib.dynamic.policy;
6+
package io.opentelemetry.contrib.dynamic.policy.tracesampling;
77

8-
import io.opentelemetry.contrib.dynamic.sampler.DelegatingSampler;
8+
import io.opentelemetry.contrib.dynamic.policy.PolicyImplementer;
9+
import io.opentelemetry.contrib.dynamic.policy.PolicyValidator;
10+
import io.opentelemetry.contrib.dynamic.policy.TelemetryPolicy;
911
import io.opentelemetry.sdk.trace.samplers.Sampler;
1012
import java.util.Collections;
1113
import java.util.List;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.contrib.dynamic.policy;
6+
package io.opentelemetry.contrib.dynamic.policy.tracesampling;
77

88
import com.fasterxml.jackson.core.JsonProcessingException;
99
import com.fasterxml.jackson.databind.JsonNode;
1010
import com.fasterxml.jackson.databind.ObjectMapper;
11+
import io.opentelemetry.contrib.dynamic.policy.PolicyValidator;
12+
import io.opentelemetry.contrib.dynamic.policy.TelemetryPolicy;
1113
import java.util.logging.Logger;
1214
import javax.annotation.Nullable;
1315

dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/sampler/DelegatingSamplerTest.java renamed to dynamic-control/src/test/java/io/opentelemetry/contrib/dynamic/policy/tracesampling/DelegatingSamplerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.contrib.dynamic.sampler;
6+
package io.opentelemetry.contrib.dynamic.policy.tracesampling;
77

88
import static org.assertj.core.api.Assertions.assertThat;
99

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.contrib.dynamic.policy;
6+
package io.opentelemetry.contrib.dynamic.policy.tracesampling;
77

88
import static java.util.Collections.singletonList;
99
import static org.assertj.core.api.Assertions.assertThat;
1010

1111
import io.opentelemetry.api.common.Attributes;
1212
import io.opentelemetry.api.trace.SpanKind;
1313
import io.opentelemetry.context.Context;
14-
import io.opentelemetry.contrib.dynamic.sampler.DelegatingSampler;
14+
import io.opentelemetry.contrib.dynamic.policy.TelemetryPolicy;
1515
import io.opentelemetry.sdk.trace.samplers.Sampler;
1616
import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
1717
import io.opentelemetry.sdk.trace.samplers.SamplingResult;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.contrib.dynamic.policy;
6+
package io.opentelemetry.contrib.dynamic.policy.tracesampling;
77

88
import static org.assertj.core.api.Assertions.assertThat;
99
import static org.assertj.core.api.Assertions.within;
1010

11+
import io.opentelemetry.contrib.dynamic.policy.TelemetryPolicy;
1112
import org.junit.jupiter.api.Test;
1213
import org.junit.jupiter.params.ParameterizedTest;
1314
import org.junit.jupiter.params.provider.ValueSource;

0 commit comments

Comments
 (0)