Remove usage of deprecated resource autoconfiguration (#139)

Author: anuraaga

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

@@ -204,4 +204,14 @@ private static String generateClientId() {
     }
     return new String(clientIdChars);
   }
+
+  // Visible for testing
+  XraySamplerClient getClient() {
+    return client;
+  }
+
+  // Visible for testing
+  Resource getResource() {
+    return resource;
+  }
 }

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

@@ -6,20 +6,26 @@
 package io.opentelemetry.contrib.awsxray;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.sdk.autoconfigure.OpenTelemetryResourceAutoConfiguration;
+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.autoconfigure.spi.traces.ConfigurableSamplerProvider;
+import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 @AutoService(ConfigurableSamplerProvider.class)
 public class AwsXrayRemoteSamplerProvider implements ConfigurableSamplerProvider {
 
   @Override
   public Sampler createSampler(ConfigProperties config) {
-    AwsXrayRemoteSamplerBuilder builder =
-        AwsXrayRemoteSampler.newBuilder(
-            OpenTelemetryResourceAutoConfiguration.configureResource(config));
+    Resource resource = ResourceHolder.resource;
+    if (resource == null) {
+      // Should never be the case in practice.
+      resource = Resource.getDefault();
+    }
+    AwsXrayRemoteSamplerBuilder builder = AwsXrayRemoteSampler.newBuilder(resource);
 
     Map<String, String> params = config.getMap("otel.traces.sampler.arg");
 
@@ -35,4 +41,22 @@ public Sampler createSampler(ConfigProperties config) {
   public String getName() {
     return "xray";
   }
+
+  // Currently the only way to read the Resource from autoconfiguration. Best would be if the SPI
+  // could return a Function<SamplerFactoryArgs, Sampler> where SamplerFactoryArgs has
+  // SDK-constructed components like Resource and Clock.
+  @AutoService(AutoConfigurationCustomizerProvider.class)
+  public static final class ResourceHolder implements AutoConfigurationCustomizerProvider {
+
+    @Nullable static volatile Resource resource;
+
+    @Override
+    public void customize(AutoConfigurationCustomizer autoConfiguration) {
+      autoConfiguration.addResourceCustomizer(
+          (resource, config) -> {
+            ResourceHolder.resource = resource;
+            return resource;
+          });
+    }
+  }
 }

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

@@ -131,6 +131,11 @@ private static String readResponse(Response response, String endpoint) throws IO
     return "";
   }
 
+  // Visible for testing
+  String getSamplingRulesEndpoint() {
+    return getSamplingRulesEndpoint;
+  }
+
   @SuppressWarnings("JavaUtilDate")
   private static class FloatDateDeserializer extends StdDeserializer<Date> {
 

aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerProviderTest.java

@@ -6,61 +6,77 @@
 package io.opentelemetry.contrib.awsxray;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.InstanceOfAssertFactories.type;
-import static org.mockito.Mockito.when;
 
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider;
-import java.util.Collections;
-import java.util.ServiceLoader;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import java.util.HashMap;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
 class AwsXrayRemoteSamplerProviderTest {
 
-  @Mock private ConfigProperties config;
-
-  @Test
-  void serviceProvider() {
-    ServiceLoader<ConfigurableSamplerProvider> samplerProviders =
-        ServiceLoader.load(ConfigurableSamplerProvider.class);
-    assertThat(samplerProviders)
-        .singleElement(type(AwsXrayRemoteSamplerProvider.class))
-        .satisfies(
-            provider -> {
-              assertThat(provider.getName()).isEqualTo("xray");
-            });
-  }
-
   @Test
-  void emptyConfig() {
-    try (AwsXrayRemoteSampler sampler =
-        (AwsXrayRemoteSampler) new AwsXrayRemoteSamplerProvider().createSampler(config)) {
+  void serviceNameOnly() {
+    Map<String, String> props = new HashMap<>();
+    props.put("otel.traces.sampler", "xray");
+    props.put("otel.service.name", "cat-service");
+    props.put("otel.traces.exporter", "none");
+    props.put("otel.metrics.exporter", "none");
+    try (SdkTracerProvider tracerProvider =
+        AutoConfiguredOpenTelemetrySdk.builder()
+            .addPropertiesSupplier(() -> props)
+            .setResultAsGlobal(false)
+            .build()
+            .getOpenTelemetrySdk()
+            .getSdkTracerProvider()) {
       // Inspect implementation details for simplicity, otherwise we'd probably need to make a
       // test HTTP server that records requests.
-      assertThat(sampler)
-          .extracting("client")
-          .extracting("getSamplingRulesEndpoint", type(String.class))
-          .isEqualTo("http://localhost:2000/GetSamplingRules");
+      assertThat(tracerProvider)
+          .extracting("sharedState")
+          .extracting("sampler")
+          .isInstanceOfSatisfying(
+              AwsXrayRemoteSampler.class,
+              sampler -> {
+                assertThat(sampler.getClient().getSamplingRulesEndpoint())
+                    .isEqualTo("http://localhost:2000/GetSamplingRules");
+                assertThat(sampler.getResource().getAttribute(ResourceAttributes.SERVICE_NAME))
+                    .isEqualTo("cat-service");
+              });
     }
   }
 
   @Test
   void setEndpoint() {
-    when(config.getMap("otel.resource.attributes")).thenReturn(Collections.emptyMap());
-    when(config.getMap("otel.traces.sampler.arg"))
-        .thenReturn(Collections.singletonMap("endpoint", "http://localhost:3000"));
-    try (AwsXrayRemoteSampler sampler =
-        (AwsXrayRemoteSampler) new AwsXrayRemoteSamplerProvider().createSampler(config)) {
+    Map<String, String> props = new HashMap<>();
+    props.put("otel.traces.sampler", "xray");
+    props.put("otel.traces.sampler.arg", "endpoint=http://localhost:3000");
+    props.put("otel.service.name", "cat-service");
+    props.put("otel.traces.exporter", "none");
+    props.put("otel.metrics.exporter", "none");
+    try (SdkTracerProvider tracerProvider =
+        AutoConfiguredOpenTelemetrySdk.builder()
+            .addPropertiesSupplier(() -> props)
+            .setResultAsGlobal(false)
+            .build()
+            .getOpenTelemetrySdk()
+            .getSdkTracerProvider()) {
       // Inspect implementation details for simplicity, otherwise we'd probably need to make a
       // test HTTP server that records requests.
-      assertThat(sampler)
-          .extracting("client")
-          .extracting("getSamplingRulesEndpoint", type(String.class))
-          .isEqualTo("http://localhost:3000/GetSamplingRules");
+      assertThat(tracerProvider)
+          .extracting("sharedState")
+          .extracting("sampler")
+          .isInstanceOfSatisfying(
+              AwsXrayRemoteSampler.class,
+              sampler -> {
+                assertThat(sampler.getClient().getSamplingRulesEndpoint())
+                    .isEqualTo("http://localhost:3000/GetSamplingRules");
+                assertThat(sampler.getResource().getAttribute(ResourceAttributes.SERVICE_NAME))
+                    .isEqualTo("cat-service");
+              });
     }
   }
 }