Skip to content

Commit 7325631

Browse files
committed
Merge PR #283: Update samplers module to follow style guide
2 parents 8d500c9 + 4e2572f commit 7325631

File tree

6 files changed

+14
-7
lines changed

6 files changed

+14
-7
lines changed

samplers/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ description = "Sampler which makes its decision based on semantic attributes val
77
otelJava.moduleName.set("io.opentelemetry.contrib.sampler")
88

99
dependencies {
10+
annotationProcessor("com.google.auto.service:auto-service")
11+
1012
api("io.opentelemetry:opentelemetry-sdk")
1113

14+
compileOnly("com.google.auto.service:auto-service")
1215
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
1316
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
1417
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
1518

19+
testImplementation("com.google.auto.service:auto-service")
1620
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
1721
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
1822
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")

samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksParentAlwaysOnSamplerProvider.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
package io.opentelemetry.contrib.sampler;
77

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
910
import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider;
1011
import io.opentelemetry.sdk.trace.samplers.Sampler;
1112

12-
public class LinksParentAlwaysOnSamplerProvider implements ConfigurableSamplerProvider {
13+
@AutoService(ConfigurableSamplerProvider.class)
14+
public final class LinksParentAlwaysOnSamplerProvider implements ConfigurableSamplerProvider {
1315
@Override
1416
public Sampler createSampler(ConfigProperties config) {
1517
return LinksBasedSampler.create(Sampler.parentBased(Sampler.alwaysOn()));

samplers/src/main/java/io/opentelemetry/contrib/sampler/internal/RuleBasedRoutingSamplerComponentProvider.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.sampler.internal;
77

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.api.common.AttributeKey;
910
import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
1011
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
@@ -22,7 +23,9 @@
2223
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
2324
* at any time.
2425
*/
25-
public class RuleBasedRoutingSamplerComponentProvider implements ComponentProvider<Sampler> {
26+
@AutoService(ComponentProvider.class)
27+
@SuppressWarnings("rawtypes")
28+
public final class RuleBasedRoutingSamplerComponentProvider implements ComponentProvider<Sampler> {
2629

2730
private static final String ACTION_RECORD_AND_SAMPLE = "RECORD_AND_SAMPLE";
2831
private static final String ACTION_DROP = "DROP";

samplers/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider

Lines changed: 0 additions & 1 deletion
This file was deleted.

samplers/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider

Lines changed: 0 additions & 1 deletion
This file was deleted.

samplers/src/test/java/io/opentelemetry/contrib/sampler/LinksBasedSamplerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.sampler;
77

8+
import static java.util.Collections.emptyList;
89
import static org.assertj.core.api.Assertions.assertThat;
910

1011
import io.opentelemetry.api.common.Attributes;
@@ -20,7 +21,6 @@
2021
import io.opentelemetry.sdk.trace.samplers.Sampler;
2122
import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
2223
import java.util.ArrayList;
23-
import java.util.Collections;
2424
import java.util.HashMap;
2525
import java.util.List;
2626
import java.util.Map;
@@ -57,7 +57,7 @@ void testEmptyAlwaysTrueRoot() {
5757
SPAN_NAME,
5858
SPAN_KIND,
5959
Attributes.empty(),
60-
Collections.emptyList())
60+
emptyList())
6161
.getDecision())
6262
.isEqualTo(SamplingDecision.RECORD_AND_SAMPLE);
6363
}
@@ -72,7 +72,7 @@ void testEmptyAlwaysFalseRoot() {
7272
SPAN_NAME,
7373
SPAN_KIND,
7474
Attributes.empty(),
75-
Collections.emptyList())
75+
emptyList())
7676
.getDecision())
7777
.isEqualTo(SamplingDecision.DROP);
7878
}

0 commit comments

Comments
 (0)