Update to OTel 1.5 (#73)

open-telemetry · Sep 6, 2021 · efc9952 · efc9952
1 parent b26bb07
commit efc9952
Show file tree

Hide file tree

Showing 15 changed files with 444 additions and 471 deletions.
diff --git a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerProvider.java b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerProvider.java
@@ -6,7 +6,7 @@
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.ConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.OpenTelemetrySdkAutoConfiguration;
+import io.opentelemetry.sdk.autoconfigure.OpenTelemetryResourceAutoConfiguration;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurableSamplerProvider;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.util.Map;
@@ -17,7 +17,8 @@ public class AwsXrayRemoteSamplerProvider implements ConfigurableSamplerProvider
   @Override
   public Sampler createSampler(ConfigProperties config) {
     AwsXrayRemoteSamplerBuilder builder =
-        AwsXrayRemoteSampler.newBuilder(OpenTelemetrySdkAutoConfiguration.getResource());
+        AwsXrayRemoteSampler.newBuilder(
+            OpenTelemetryResourceAutoConfiguration.configureResource(config));
 
     Map<String, String> params = config.getCommaSeparatedMap("otel.traces.sampler.arg");
 

diff --git a/...xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerProviderTest.java b/...xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerProviderTest.java
@@ -49,6 +49,8 @@ void emptyConfig() {
 
   @Test
   void setEndpoint() {
+    when(config.getCommaSeparatedMap("otel.resource.attributes"))
+        .thenReturn(Collections.emptyMap());
     when(config.getCommaSeparatedMap("otel.traces.sampler.arg"))
         .thenReturn(Collections.singletonMap("endpoint", "http://localhost:3000"));
     try (AwsXrayRemoteSampler sampler =

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -17,8 +17,8 @@ val DEPENDENCY_BOMS = listOf(
     "org.junit:junit-bom:5.7.2",
     "com.linecorp.armeria:armeria-bom:1.9.1",
     "io.grpc:grpc-bom:1.39.0",
-    "io.opentelemetry:opentelemetry-bom:1.4.1",
-    "io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha",
+    "io.opentelemetry:opentelemetry-bom:1.5.0",
+    "io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha",
     "org.testcontainers:testcontainers-bom:1.16.0"
 )