Merge all prs 20250824 140640

aws-resources/build.gradle.kts

@@ -8,6 +8,8 @@ description = "OpenTelemetry AWS Resources Support"
 otelJava.moduleName.set("io.opentelemetry.contrib.aws.resource")
 
 dependencies {
+  annotationProcessor("com.google.auto.service:auto-service")
+
   api("io.opentelemetry:opentelemetry-api")
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
   api("io.opentelemetry:opentelemetry-sdk")
@@ -16,13 +18,15 @@ dependencies {
   testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
 
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
+  compileOnly("com.google.auto.service:auto-service")
 
   implementation("com.fasterxml.jackson.core:jackson-core")
   implementation("com.squareup.okhttp3:okhttp")
 
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-api-incubator")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
+  testImplementation("com.google.auto.service:auto-service")
 
   testImplementation("com.linecorp.armeria:armeria-junit5")
   testRuntimeOnly("org.bouncycastle:bcpkix-jdk15on")

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceProvider.java

@@ -5,11 +5,13 @@
 
 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) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceProvider.java

@@ -5,11 +5,13 @@
 
 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) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResourceProvider.java

@@ -5,11 +5,13 @@
 
 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) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResourceProvider.java

@@ -5,11 +5,13 @@
 
 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) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResourceProvider.java

@@ -5,11 +5,13 @@
 
 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) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/internal/AwsResourceDetector.java

@@ -5,6 +5,7 @@
 
 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;
@@ -15,7 +16,9 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
 
-public class AwsResourceDetector implements ComponentProvider<Resource> {
+@AutoService(ComponentProvider.class)
+@SuppressWarnings("rawtypes")
+public final class AwsResourceDetector implements ComponentProvider<Resource> {
 
   @Override
   public Class<Resource> getType() {

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AttributePropagatingSpanProcessorBuilder.java

@@ -5,12 +5,12 @@
 
 package io.opentelemetry.contrib.awsxray;
 
+import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.common.AttributeKey;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -19,7 +19,7 @@
  * #setAttributesKeysToPropagate} are not invoked, the builder defaults to using specific {@link
  * AwsAttributeKeys} as propagation targets.
  */
-public class AttributePropagatingSpanProcessorBuilder {
+public final class AttributePropagatingSpanProcessorBuilder {
 
   private AttributeKey<String> spanNamePropagationKey = AwsAttributeKeys.AWS_LOCAL_OPERATION;
   private List<AttributeKey<String>> attributesKeysToPropagate =
@@ -43,7 +43,7 @@ public AttributePropagatingSpanProcessorBuilder setSpanNamePropagationKey(
   public AttributePropagatingSpanProcessorBuilder setAttributesKeysToPropagate(
       List<AttributeKey<String>> attributesKeysToPropagate) {
     requireNonNull(attributesKeysToPropagate, "attributesKeysToPropagate");
-    this.attributesKeysToPropagate = Collections.unmodifiableList(attributesKeysToPropagate);
+    this.attributesKeysToPropagate = unmodifiableList(attributesKeysToPropagate);
     return this;
   }
 

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsAttributeKeys.java

@@ -5,35 +5,34 @@
 
 package io.opentelemetry.contrib.awsxray;
 
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
+
 import io.opentelemetry.api.common.AttributeKey;
 
 /** Utility class holding attribute keys with special meaning to AWS components */
 final class AwsAttributeKeys {
 
-  private AwsAttributeKeys() {}
-
-  static final AttributeKey<String> AWS_SPAN_KIND = AttributeKey.stringKey("aws.span.kind");
+  static final AttributeKey<String> AWS_SPAN_KIND = stringKey("aws.span.kind");
 
-  static final AttributeKey<String> AWS_LOCAL_SERVICE = AttributeKey.stringKey("aws.local.service");
+  static final AttributeKey<String> AWS_LOCAL_SERVICE = stringKey("aws.local.service");
 
-  static final AttributeKey<String> AWS_LOCAL_OPERATION =
-      AttributeKey.stringKey("aws.local.operation");
+  static final AttributeKey<String> AWS_LOCAL_OPERATION = stringKey("aws.local.operation");
 
-  static final AttributeKey<String> AWS_REMOTE_SERVICE =
-      AttributeKey.stringKey("aws.remote.service");
+  static final AttributeKey<String> AWS_REMOTE_SERVICE = stringKey("aws.remote.service");
 
-  static final AttributeKey<String> AWS_REMOTE_OPERATION =
-      AttributeKey.stringKey("aws.remote.operation");
+  static final AttributeKey<String> AWS_REMOTE_OPERATION = stringKey("aws.remote.operation");
 
-  static final AttributeKey<String> AWS_REMOTE_TARGET = AttributeKey.stringKey("aws.remote.target");
+  static final AttributeKey<String> AWS_REMOTE_TARGET = stringKey("aws.remote.target");
 
   // use the same AWS Resource attribute name defined by OTel java auto-instr for aws_sdk_v_1_1
   // TODO: all AWS specific attributes should be defined in semconv package and reused cross all
   // otel packages. Related sim -
   // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/8710
 
-  static final AttributeKey<String> AWS_BUCKET_NAME = AttributeKey.stringKey("aws.bucket.name");
-  static final AttributeKey<String> AWS_QUEUE_NAME = AttributeKey.stringKey("aws.queue.name");
-  static final AttributeKey<String> AWS_STREAM_NAME = AttributeKey.stringKey("aws.stream.name");
-  static final AttributeKey<String> AWS_TABLE_NAME = AttributeKey.stringKey("aws.table.name");
+  static final AttributeKey<String> AWS_BUCKET_NAME = stringKey("aws.bucket.name");
+  static final AttributeKey<String> AWS_QUEUE_NAME = stringKey("aws.queue.name");
+  static final AttributeKey<String> AWS_STREAM_NAME = stringKey("aws.stream.name");
+  static final AttributeKey<String> AWS_TABLE_NAME = stringKey("aws.table.name");
+
+  private AwsAttributeKeys() {}
 }

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsMetricAttributesSpanExporter.java

@@ -30,7 +30,7 @@
  * attributes.
  */
 @Immutable
-public class AwsMetricAttributesSpanExporter implements SpanExporter {
+public final class AwsMetricAttributesSpanExporter implements SpanExporter {
 
   private final SpanExporter delegate;
   private final MetricAttributeGenerator generator;

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsMetricAttributesSpanExporterBuilder.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 
-public class AwsMetricAttributesSpanExporterBuilder {
+public final class AwsMetricAttributesSpanExporterBuilder {
 
   // Defaults
   private static final MetricAttributeGenerator DEFAULT_GENERATOR =

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessor.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.contrib.awsxray;
 
+import static io.opentelemetry.api.common.AttributeKey.longKey;
+
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.DoubleHistogram;
@@ -41,7 +43,7 @@
 public final class AwsSpanMetricsProcessor implements SpanProcessor {
 
   private static final AttributeKey<Long> HTTP_STATUS_CODE =
-      AttributeKey.longKey("http.status_code");
+      longKey("http.status_code");
 
   private static final double NANOS_TO_MILLIS = 1_000_000.0;
 

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSampler.java

@@ -5,6 +5,13 @@
 
 package io.opentelemetry.contrib.awsxray;
 
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.logging.FINE;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
@@ -29,17 +36,15 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 /** Remote sampler that gets sampling configuration from AWS X-Ray. */
 public final class AwsXrayRemoteSampler implements Sampler, Closeable {
 
-  static final long DEFAULT_TARGET_INTERVAL_NANOS = TimeUnit.SECONDS.toNanos(10);
+  static final long DEFAULT_TARGET_INTERVAL_NANOS = SECONDS.toNanos(10);
 
   private static final Logger logger = Logger.getLogger(AwsXrayRemoteSampler.class.getName());
 
@@ -134,26 +139,25 @@ private void getAndUpdateSampler() {
                 initialSampler,
                 response.getSamplingRules().stream()
                     .map(SamplingRuleRecord::getRule)
-                    .collect(Collectors.toList())));
+                    .collect(toList())));
 
         previousRulesResponse = response;
         ScheduledFuture<?> existingFetchTargetsFuture = fetchTargetsFuture;
         if (existingFetchTargetsFuture != null) {
           existingFetchTargetsFuture.cancel(false);
         }
         fetchTargetsFuture =
-            executor.schedule(
-                this::fetchTargets, DEFAULT_TARGET_INTERVAL_NANOS, TimeUnit.NANOSECONDS);
+            executor.schedule(this::fetchTargets, DEFAULT_TARGET_INTERVAL_NANOS, NANOSECONDS);
       }
     } catch (Throwable t) {
-      logger.log(Level.FINE, "Failed to update sampler", t);
+      logger.log(FINE, "Failed to update sampler", t);
     }
     scheduleSamplerUpdate();
   }
 
   private void scheduleSamplerUpdate() {
     long delay = pollingIntervalNanos + jitterNanos.next();
-    pollFuture = executor.schedule(this::getAndUpdateSampler, delay, TimeUnit.NANOSECONDS);
+    pollFuture = executor.schedule(this::getAndUpdateSampler, delay, NANOSECONDS);
   }
 
   /**
@@ -168,7 +172,7 @@ Duration getNextSamplerUpdateScheduledDuration() {
     if (pollFuture == null) {
       return null;
     }
-    return Duration.ofNanos(pollFuture.getDelay(TimeUnit.NANOSECONDS));
+    return Duration.ofNanos(pollFuture.getDelay(NANOSECONDS));
   }
 
   private void fetchTargets() {
@@ -181,28 +185,25 @@ private void fetchTargets() {
       Date now = Date.from(Instant.ofEpochSecond(0, clock.now()));
       List<SamplingStatisticsDocument> statistics = xrayRulesSampler.snapshot(now);
       Set<String> requestedTargetRuleNames =
-          statistics.stream()
-              .map(SamplingStatisticsDocument::getRuleName)
-              .collect(Collectors.toSet());
+          statistics.stream().map(SamplingStatisticsDocument::getRuleName).collect(toSet());
 
       GetSamplingTargetsResponse response =
           client.getSamplingTargets(GetSamplingTargetsRequest.create(statistics));
       Map<String, SamplingTargetDocument> targets =
           response.getDocuments().stream()
-              .collect(Collectors.toMap(SamplingTargetDocument::getRuleName, Function.identity()));
+              .collect(toMap(SamplingTargetDocument::getRuleName, Function.identity()));
       updateInternalSamplers(xrayRulesSampler.withTargets(targets, requestedTargetRuleNames, now));
     } catch (Throwable t) {
       // Might be a transient API failure, try again after a default interval.
       fetchTargetsFuture =
-          executor.schedule(
-              this::fetchTargets, DEFAULT_TARGET_INTERVAL_NANOS, TimeUnit.NANOSECONDS);
+          executor.schedule(this::fetchTargets, DEFAULT_TARGET_INTERVAL_NANOS, NANOSECONDS);
       return;
     }
 
     long nextTargetFetchIntervalNanos =
         xrayRulesSampler.nextTargetFetchTimeNanos() - clock.nanoTime();
     fetchTargetsFuture =
-        executor.schedule(this::fetchTargets, nextTargetFetchIntervalNanos, TimeUnit.NANOSECONDS);
+        executor.schedule(this::fetchTargets, nextTargetFetchIntervalNanos, NANOSECONDS);
   }
 
   @Override

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerBuilder.java

@@ -6,6 +6,8 @@
 package io.opentelemetry.contrib.awsxray;
 
 import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.sdk.common.Clock;
@@ -26,7 +28,7 @@ public final class AwsXrayRemoteSamplerBuilder {
   private Clock clock = Clock.getDefault();
   private String endpoint = DEFAULT_ENDPOINT;
   @Nullable private Sampler initialSampler;
-  private long pollingIntervalNanos = TimeUnit.SECONDS.toNanos(DEFAULT_POLLING_INTERVAL_SECS);
+  private long pollingIntervalNanos = SECONDS.toNanos(DEFAULT_POLLING_INTERVAL_SECS);
 
   AwsXrayRemoteSamplerBuilder(Resource resource) {
     this.resource = resource;
@@ -51,7 +53,7 @@ public AwsXrayRemoteSamplerBuilder setEndpoint(String endpoint) {
   @CanIgnoreReturnValue
   public AwsXrayRemoteSamplerBuilder setPollingInterval(Duration delay) {
     requireNonNull(delay, "delay");
-    return setPollingInterval(delay.toNanos(), TimeUnit.NANOSECONDS);
+    return setPollingInterval(delay.toNanos(), NANOSECONDS);
   }
 
   /**

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerProvider.java

@@ -15,7 +15,7 @@
 import java.util.Map;
 
 @AutoService(ConfigurableSamplerProvider.class)
-public class AwsXrayRemoteSamplerProvider implements ConfigurableSamplerProvider {
+public final class AwsXrayRemoteSamplerProvider implements ConfigurableSamplerProvider {
 
   @Override
   public Sampler createSampler(ConfigProperties config) {