Use AutoConfigurationCustomizerProvider APIs (#204)

Use AutoConfigurationCustomizerProvider instead of deprecated APIs that
were removed in the Upstream Otel v1.18

Author: rapphil

awsagentprovider/build.gradle.kts

@@ -31,7 +31,9 @@ dependencies {
   implementation("io.opentelemetry.contrib:opentelemetry-aws-xray")
 
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
-
+  testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
+  testImplementation("io.opentelemetry:opentelemetry-extension-aws")
+  testImplementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
   testImplementation("com.google.guava:guava")
 
   compileOnly("com.google.code.findbugs:jsr305:3.0.2")

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsAgentProperties.java renamed to awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsAgentPropertiesCustomizerProvider.java

@@ -15,16 +15,20 @@
 
 package software.amazon.opentelemetry.javaagent.providers;
 
-import io.opentelemetry.javaagent.extension.config.ConfigPropertySource;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 import java.util.HashMap;
-import java.util.Map;
 
-public class AwsAgentProperties implements ConfigPropertySource {
+public class AwsAgentPropertiesCustomizerProvider implements AutoConfigurationCustomizerProvider {
   @Override
-  public Map<String, String> getProperties() {
-    Map<String, String> properties = new HashMap<>();
-    properties.put("otel.propagators", "xray,tracecontext,b3,b3multi");
-    properties.put("otel.instrumentation.aws-sdk.experimental-span-attributes", "true");
-    return properties;
+  public void customize(AutoConfigurationCustomizer autoConfiguration) {
+    autoConfiguration.addPropertiesSupplier(
+        () ->
+            new HashMap<String, String>() {
+              {
+                put("otel.propagators", "xray,tracecontext,b3,b3multi");
+                put("otel.instrumentation.aws-sdk.experimental-span-attributes", "true");
+              }
+            });
   }
 }

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerConfigurer.java renamed to awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerCustomizerProvider.java

@@ -16,12 +16,10 @@
 package software.amazon.opentelemetry.javaagent.providers;
 
 import io.opentelemetry.contrib.awsxray.AwsXrayIdGenerator;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.spi.traces.SdkTracerProviderConfigurer;
-import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
-
-public class AwsTracerConfigurer implements SdkTracerProviderConfigurer {
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 
+public class AwsTracerCustomizerProvider implements AutoConfigurationCustomizerProvider {
   static {
     if (System.getProperty("otel.aws.imds.endpointOverride") == null) {
       String overrideFromEnv = System.getenv("OTEL_AWS_IMDS_ENDPOINT_OVERRIDE");
@@ -32,8 +30,9 @@ public class AwsTracerConfigurer implements SdkTracerProviderConfigurer {
   }
 
   @Override
-  public void configure(
-      SdkTracerProviderBuilder sdkTracerProviderBuilder, ConfigProperties config) {
-    sdkTracerProviderBuilder.setIdGenerator(AwsXrayIdGenerator.getInstance());
+  public void customize(AutoConfigurationCustomizer autoConfiguration) {
+    autoConfiguration.addTracerProviderCustomizer(
+        (tracerProviderBuilder, configProps) ->
+            tracerProviderBuilder.setIdGenerator(AwsXrayIdGenerator.getInstance()));
   }
 }

awsagentprovider/src/main/resources/META-INF/services/io.opentelemetry.javaagent.extension.config.ConfigPropertySource

@@ -1,5 +1,5 @@
 #
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com, Inc. or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
 # You may not use this file except in compliance with the License.
@@ -13,4 +13,5 @@
 # permissions and limitations under the License.
 #
 
-software.amazon.opentelemetry.javaagent.providers.AwsTracerConfigurer
+software.amazon.opentelemetry.javaagent.providers.AwsAgentPropertiesCustomizerProvider
+software.amazon.opentelemetry.javaagent.providers.AwsTracerCustomizerProvider

awsagentprovider/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.SdkTracerProviderConfigurer renamed to awsagentprovider/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider

@@ -15,27 +15,43 @@
 
 package software.amazon.opentelemetry.javaagent.providers;
 
+import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.primitives.Ints;
-import io.opentelemetry.api.trace.TracerProvider;
-import io.opentelemetry.sdk.trace.SdkTracerProvider;
-import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder;
+import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.RepeatedTest;
 
 class AwsTracerConfigurerTest {
 
+  private AutoConfiguredOpenTelemetrySdkBuilder createSdkBuilder() {
+    InMemorySpanExporter spanExporter = InMemorySpanExporter.create();
+    return AutoConfiguredOpenTelemetrySdk.builder()
+        .addTracerProviderCustomizer(
+            (tracerProviderBuilder, config) -> {
+              return tracerProviderBuilder.addSpanProcessor(
+                  SimpleSpanProcessor.create(spanExporter));
+            })
+        .addPropertiesSupplier(() -> singletonMap("otel.metrics.exporter", "none"))
+        .addPropertiesSupplier(() -> singletonMap("otel.traces.exporter", "none"))
+        .addPropertiesSupplier(() -> singletonMap("otel.logs.exporter", "none"))
+        .setResultAsGlobal(false);
+  }
   // The probability of this passing once without correct IDs is low, 20 times is inconceivable.
   @RepeatedTest(20)
   void providerGeneratesXrayIds() {
-    SdkTracerProviderBuilder builder = SdkTracerProvider.builder();
-    new AwsTracerConfigurer().configure(builder, null);
-    TracerProvider tracerProvider = builder.build();
+    OpenTelemetrySdk sdk = createSdkBuilder().build().getOpenTelemetrySdk();
 
+    Tracer tracer = sdk.getTracer("test");
     int startTimeSecs = (int) TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis());
-    var span = tracerProvider.get("test").spanBuilder("test").startSpan();
+    var span = tracer.spanBuilder("test").startSpan();
     byte[] traceId = span.getSpanContext().getTraceIdBytes();
     int epoch = Ints.fromBytes(traceId[0], traceId[1], traceId[2], traceId[3]);
     assertThat(epoch).isGreaterThanOrEqualTo(startTimeSecs);
@@ -44,14 +60,19 @@ void providerGeneratesXrayIds() {
   // Sanity check that the trace ID ratio sampler works fine with the x-ray generator.
   @RepeatedTest(20)
   void traceIdRatioSampler() {
-    SdkTracerProviderBuilder builder =
-        SdkTracerProvider.builder().setSampler(Sampler.traceIdRatioBased(0.01));
-    new AwsTracerConfigurer().configure(builder, null);
-    TracerProvider tracerProvider = builder.build();
+    OpenTelemetrySdk sdk =
+        createSdkBuilder()
+            .addTracerProviderCustomizer(
+                (tracerProviderBuilder, config) ->
+                    tracerProviderBuilder.setSampler(Sampler.traceIdRatioBased(0.01)))
+            .build()
+            .getOpenTelemetrySdk();
+
     int numSpans = 100000;
     int numSampled = 0;
+    Tracer tracer = sdk.getTracer("test");
     for (int i = 0; i < numSpans; i++) {
-      var span = tracerProvider.get("test").spanBuilder("test").startSpan();
+      var span = tracer.spanBuilder("test").startSpan();
       if (span.getSpanContext().getTraceFlags().isSampled()) {
         numSampled++;
       }