Skip to content

Commit 3d6ecdd

Browse files
committed
Merge PR #412: Update samplers module to follow style guide
2 parents 713859b + 96945d1 commit 3d6ecdd

7 files changed

+14
-6
lines changed

samplers/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ dependencies {
1313
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
1414
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
1515

16+
annotationProcessor("com.google.auto.service:auto-service")
17+
compileOnly("com.google.auto.service:auto-service-annotations")
18+
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/LinksBasedSampler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public SamplingResult shouldSample(
3737
SpanKind spanKind,
3838
Attributes attributes,
3939
List<LinkData> parentLinks) {
40-
if (parentLinks.size() > 0) {
40+
if (!parentLinks.isEmpty()) {
4141
for (LinkData linkData : parentLinks) {
4242
if (linkData.getSpanContext().isSampled()) {
4343
return SamplingResult.recordAndSample();

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/SamplingRule.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55

66
package io.opentelemetry.contrib.sampler;
77

8+
import static java.util.Objects.hash;
9+
810
import io.opentelemetry.api.common.AttributeKey;
911
import io.opentelemetry.sdk.trace.samplers.Sampler;
10-
import java.util.Objects;
1112
import java.util.regex.Pattern;
1213
import javax.annotation.Nullable;
1314

@@ -48,6 +49,6 @@ public boolean equals(@Nullable Object o) {
4849

4950
@Override
5051
public int hashCode() {
51-
return Objects.hash(attributeKey, pattern);
52+
return hash(attributeKey, pattern);
5253
}
5354
}

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

Lines changed: 3 additions & 0 deletions
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,6 +23,8 @@
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
*/
26+
@SuppressWarnings("rawtypes")
27+
@AutoService(ComponentProvider.class)
2528
public class RuleBasedRoutingSamplerComponentProvider implements ComponentProvider<Sampler> {
2629

2730
private static final String ACTION_RECORD_AND_SAMPLE = "RECORD_AND_SAMPLE";

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.

0 commit comments

Comments
 (0)