Merge PR #370: Update aws-xray-propagator module to follow style guide

Author: trask

aws-xray-propagator/build.gradle.kts

@@ -11,6 +11,10 @@ dependencies {
   api("io.opentelemetry:opentelemetry-api")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
+
+  annotationProcessor("com.google.auto.service:auto-service")
+  compileOnly("com.google.auto.service:auto-service-annotations")
+
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-sdk-trace")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")

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

@@ -5,12 +5,13 @@
 
 package io.opentelemetry.contrib.awsxray.propagator;
 
+import static java.util.Collections.singletonMap;
+
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.context.propagation.TextMapSetter;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -75,7 +76,7 @@ public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C
     }
     return xrayPropagator.extract(
         xrayContext,
-        Collections.singletonMap(AwsXrayPropagator.TRACE_HEADER_KEY, traceHeader),
+        singletonMap(AwsXrayPropagator.TRACE_HEADER_KEY, traceHeader),
         MapGetter.INSTANCE);
   }
 

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

@@ -6,6 +6,7 @@
 package io.opentelemetry.contrib.awsxray.propagator;
 
 import static io.opentelemetry.api.internal.OtelEncodingUtils.isValidBase16String;
+import static java.util.Collections.singletonList;
 
 import io.opentelemetry.api.baggage.Baggage;
 import io.opentelemetry.api.baggage.BaggageBuilder;
@@ -20,7 +21,6 @@
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.context.propagation.TextMapSetter;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
@@ -80,7 +80,7 @@ public final class AwsXrayPropagator implements TextMapPropagator {
   private static final String INVALID_LINEAGE = "-1:11111111:0";
   private static final int NUM_OF_LINEAGE_DELIMITERS = 2;
 
-  private static final List<String> FIELDS = Collections.singletonList(TRACE_HEADER_KEY);
+  private static final List<String> FIELDS = singletonList(TRACE_HEADER_KEY);
 
   private static final AwsXrayPropagator INSTANCE = new AwsXrayPropagator();
 

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsConfigurablePropagator.java

@@ -5,6 +5,7 @@
 
 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;
@@ -14,7 +15,8 @@
  * A {@link ConfigurablePropagatorProvider} which allows enabling the {@link AwsXrayPropagator} with
  * the propagator name {@code xray}.
  */
-public final class AwsConfigurablePropagator implements ConfigurablePropagatorProvider {
+@AutoService(ConfigurablePropagatorProvider.class)
+public class AwsConfigurablePropagator implements ConfigurablePropagatorProvider {
   @Override
   public TextMapPropagator getPropagator(ConfigProperties config) {
     return AwsXrayPropagator.getInstance();

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayComponentProvider.java

@@ -5,11 +5,14 @@
 
 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;
 
+@AutoService(ComponentProvider.class)
+@SuppressWarnings("rawtypes")
 public class AwsXrayComponentProvider implements ComponentProvider<TextMapPropagator> {
   @Override
   public Class<TextMapPropagator> getType() {

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayLambdaComponentProvider.java

@@ -5,11 +5,14 @@
 
 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;
 
+@AutoService(ComponentProvider.class)
+@SuppressWarnings("rawtypes")
 public class AwsXrayLambdaComponentProvider implements ComponentProvider<TextMapPropagator> {
   @Override
   public Class<TextMapPropagator> getType() {

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsXrayLambdaConfigurablePropagator.java

@@ -5,6 +5,7 @@
 
 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;
@@ -14,7 +15,8 @@
  * A {@link ConfigurablePropagatorProvider} which allows enabling the {@link
  * AwsXrayLambdaPropagator} with the propagator name {@code xray-lambda}.
  */
-public final class AwsXrayLambdaConfigurablePropagator implements ConfigurablePropagatorProvider {
+@AutoService(ConfigurablePropagatorProvider.class)
+public class AwsXrayLambdaConfigurablePropagator implements ConfigurablePropagatorProvider {
   @Override
   public TextMapPropagator getPropagator(ConfigProperties config) {
     return AwsXrayLambdaPropagator.getInstance();