Revert AutoService changes

trask · trask · commit 2c76010829d4 · 2025-08-31T09:47:44.000-07:00
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceProvider.java
@@ -5,13 +5,11 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link BeanstalkResource}. */
-@AutoService(ResourceProvider.class)
 public final class BeanstalkResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceProvider.java
@@ -5,13 +5,11 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link Ec2Resource}. */
-@AutoService(ResourceProvider.class)
 public final class Ec2ResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResourceProvider.java
@@ -5,13 +5,11 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link EcsResource}. */
-@AutoService(ResourceProvider.class)
 public final class EcsResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResourceProvider.java
@@ -5,13 +5,11 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link EksResource}. */
-@AutoService(ResourceProvider.class)
 public final class EksResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResourceProvider.java
@@ -5,13 +5,11 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link LambdaResource}. */
-@AutoService(ResourceProvider.class)
 public final class LambdaResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/internal/AwsResourceDetector.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/internal/AwsResourceDetector.java
@@ -5,7 +5,6 @@
 
 package io.opentelemetry.contrib.aws.resource.internal;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.contrib.aws.resource.BeanstalkResource;
 import io.opentelemetry.contrib.aws.resource.Ec2Resource;
@@ -16,8 +15,6 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
 
-@SuppressWarnings("rawtypes")
-@AutoService(ComponentProvider.class)
 public class AwsResourceDetector implements ComponentProvider<Resource> {
 
   @Override
diff --git a/aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider b/aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider
@@ -0,0 +1,5 @@
+io.opentelemetry.contrib.aws.resource.BeanstalkResourceProvider
+io.opentelemetry.contrib.aws.resource.Ec2ResourceProvider
+io.opentelemetry.contrib.aws.resource.EcsResourceProvider
+io.opentelemetry.contrib.aws.resource.EksResourceProvider
+io.opentelemetry.contrib.aws.resource.LambdaResourceProvider
diff --git a/aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
@@ -0,0 +1 @@
+io.opentelemetry.contrib.aws.resource.internal.AwsResourceDetector
diff --git a/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsConfigurablePropagator.java b/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsConfigurablePropagator.java
@@ -5,7 +5,6 @@
 
 package io.opentelemetry.contrib.awsxray.propagator.internal;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -15,7 +14,6 @@
  * A {@link ConfigurablePropagatorProvider} which allows enabling the {@link AwsXrayPropagator} with
  * the propagator name {@code xray}.
  */
-@AutoService(ConfigurablePropagatorProvider.class)
 public final class AwsConfigurablePropagator implements ConfigurablePropagatorProvider {
   @Override
   public TextMapPropagator getPropagator(ConfigProperties config) {
diff --git a/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayComponentProvider.java b/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayComponentProvider.java
@@ -5,14 +5,11 @@
 
 package io.opentelemetry.contrib.awsxray.propagator.internal;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 
-@SuppressWarnings("rawtypes")
-@AutoService(ComponentProvider.class)
 public class AwsXrayComponentProvider implements ComponentProvider<TextMapPropagator> {
   @Override
   public Class<TextMapPropagator> getType() {
diff --git a/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayLambdaComponentProvider.java b/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayLambdaComponentProvider.java
@@ -5,14 +5,11 @@
 
 package io.opentelemetry.contrib.awsxray.propagator.internal;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.contrib.awsxray.propagator.AwsXrayLambdaPropagator;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 
-@SuppressWarnings("rawtypes")
-@AutoService(ComponentProvider.class)
 public class AwsXrayLambdaComponentProvider implements ComponentProvider<TextMapPropagator> {
   @Override
   public Class<TextMapPropagator> getType() {
diff --git a/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayLambdaConfigurablePropagator.java b/aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayLambdaConfigurablePropagator.java
@@ -5,7 +5,6 @@
 
 package io.opentelemetry.contrib.awsxray.propagator.internal;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.contrib.awsxray.propagator.AwsXrayLambdaPropagator;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -15,7 +14,6 @@
  * A {@link ConfigurablePropagatorProvider} which allows enabling the {@link
  * AwsXrayLambdaPropagator} with the propagator name {@code xray-lambda}.
  */
-@AutoService(ConfigurablePropagatorProvider.class)
 public final class AwsXrayLambdaConfigurablePropagator implements ConfigurablePropagatorProvider {
   @Override
   public TextMapPropagator getPropagator(ConfigProperties config) {
diff --git a/aws-xray-propagator/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider b/aws-xray-propagator/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider
@@ -0,0 +1,2 @@
+io.opentelemetry.contrib.awsxray.propagator.internal.AwsConfigurablePropagator
+io.opentelemetry.contrib.awsxray.propagator.internal.AwsXrayLambdaConfigurablePropagator
diff --git a/aws-xray-propagator/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/aws-xray-propagator/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
@@ -0,0 +1,2 @@
+io.opentelemetry.contrib.awsxray.propagator.internal.AwsXrayComponentProvider
+io.opentelemetry.contrib.awsxray.propagator.internal.AwsXrayLambdaComponentProvider
diff --git a/baggage-processor/src/main/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizer.java b/baggage-processor/src/main/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizer.java
@@ -5,15 +5,13 @@
 
 package io.opentelemetry.contrib.baggage.processor;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import java.util.List;
 
-@AutoService(AutoConfigurationCustomizerProvider.class)
 public class BaggageProcessorCustomizer implements AutoConfigurationCustomizerProvider {
   @Override
   public void customize(AutoConfigurationCustomizer autoConfigurationCustomizer) {
diff --git a/baggage-processor/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider b/baggage-processor/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider
@@ -0,0 +1 @@
+io.opentelemetry.contrib.baggage.processor.BaggageProcessorCustomizer
diff --git a/samplers/build.gradle.kts b/samplers/build.gradle.kts
@@ -13,10 +13,6 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
 
-  annotationProcessor("com.google.auto.service:auto-service")
-  compileOnly("com.google.auto.service:auto-service-annotations")
-
-  testImplementation("com.google.auto.service:auto-service")
   testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
diff --git a/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java b/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksBasedSampler.java
@@ -37,7 +37,7 @@ public SamplingResult shouldSample(
       SpanKind spanKind,
       Attributes attributes,
       List<LinkData> parentLinks) {
-    if (!parentLinks.isEmpty()) {
+    if (parentLinks.size() > 0) {
       for (LinkData linkData : parentLinks) {
         if (linkData.getSpanContext().isSampled()) {
           return SamplingResult.recordAndSample();
diff --git a/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksParentAlwaysOnSamplerProvider.java b/samplers/src/main/java/io/opentelemetry/contrib/sampler/LinksParentAlwaysOnSamplerProvider.java
@@ -5,12 +5,10 @@
 
 package io.opentelemetry.contrib.sampler;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 
-@AutoService(ConfigurableSamplerProvider.class)
 public class LinksParentAlwaysOnSamplerProvider implements ConfigurableSamplerProvider {
   @Override
   public Sampler createSampler(ConfigProperties config) {
diff --git a/samplers/src/main/java/io/opentelemetry/contrib/sampler/internal/RuleBasedRoutingSamplerComponentProvider.java b/samplers/src/main/java/io/opentelemetry/contrib/sampler/internal/RuleBasedRoutingSamplerComponentProvider.java
@@ -5,7 +5,6 @@
 
 package io.opentelemetry.contrib.sampler.internal;
 
-import com.google.auto.service.AutoService;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
@@ -23,8 +22,6 @@
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
  */
-@SuppressWarnings("rawtypes")
-@AutoService(ComponentProvider.class)
 public class RuleBasedRoutingSamplerComponentProvider implements ComponentProvider<Sampler> {
 
   private static final String ACTION_RECORD_AND_SAMPLE = "RECORD_AND_SAMPLE";
diff --git a/samplers/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/samplers/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider
@@ -0,0 +1 @@
+io.opentelemetry.contrib.sampler.internal.RuleBasedRoutingSamplerComponentProvider
diff --git a/samplers/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider b/samplers/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider
@@ -0,0 +1 @@
+io.opentelemetry.contrib.sampler.LinksParentAlwaysOnSamplerProvider

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+io.opentelemetry.contrib.aws.resource.internal.AwsResourceDetector`