Update to upstream 0.15.0 (#39)

Author: anuraaga

awsagentprovider/build.gradle.kts

@@ -23,12 +23,14 @@ base {
 }
 
 dependencies {
-  compileOnly("io.opentelemetry:opentelemetry-sdk")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-spi")
+  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   compileOnly("org.slf4j:slf4j-api")
 
   implementation("io.opentelemetry:opentelemetry-sdk-extension-aws")
 
+  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
+
   testImplementation("com.google.guava:guava")
 
   compileOnly("com.google.code.findbugs:jsr305:3.0.2")

awsagentprovider/src/main/java/io/opentelemetry/sdk/trace/RandomIdGenerator.java

@@ -15,14 +15,11 @@
 
 package software.amazon.opentelemetry.javaagent.providers;
 
-import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.SdkTracerProviderConfigurer;
 import io.opentelemetry.sdk.extension.aws.trace.AwsXrayIdGenerator;
-import io.opentelemetry.sdk.trace.SdkTracerProvider;
-import io.opentelemetry.spi.trace.TracerProviderFactory;
+import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 
-public class AwsTracerProviderFactory implements TracerProviderFactory {
-
-  private static final SdkTracerProvider TRACER_PROVIDER;
+public class AwsTracerConfigurer implements SdkTracerProviderConfigurer {
 
   static {
     if (System.getProperty("otel.aws.imds.endpointOverride") == null) {
@@ -31,13 +28,10 @@ public class AwsTracerProviderFactory implements TracerProviderFactory {
         System.setProperty("otel.aws.imds.endpointOverride", overrideFromEnv);
       }
     }
-
-    TRACER_PROVIDER =
-        SdkTracerProvider.builder().setIdGenerator(AwsXrayIdGenerator.getInstance()).build();
   }
 
   @Override
-  public TracerProvider create() {
-    return TRACER_PROVIDER;
+  public void configure(SdkTracerProviderBuilder sdkTracerProviderBuilder) {
+    sdkTracerProviderBuilder.setIdGenerator(AwsXrayIdGenerator.getInstance());
   }
 }

…/providers/AwsTracerProviderFactory.java …agent/providers/AwsTracerConfigurer.javaawsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerProviderFactory.java renamed to awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerConfigurer.java awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerProviderFactory.java renamed to awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerConfigurer.java

@@ -13,4 +13,4 @@
 # permissions and limitations under the License.
 #
 
-software.amazon.opentelemetry.javaagent.providers.AwsTracerProviderFactory
+software.amazon.opentelemetry.javaagent.providers.AwsTracerConfigurer

…elemetry.spi.trace.TracerProviderFactory …onfigure.spi.SdkTracerProviderConfigurerawsagentprovider/src/main/resources/META-INF/services/io.opentelemetry.javaagent.shaded.io.opentelemetry.spi.trace.TracerProviderFactory renamed to awsagentprovider/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.SdkTracerProviderConfigurer awsagentprovider/src/main/resources/META-INF/services/io.opentelemetry.javaagent.shaded.io.opentelemetry.spi.trace.TracerProviderFactory renamed to awsagentprovider/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.SdkTracerProviderConfigurer

@@ -19,12 +19,20 @@
 
 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 java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.RepeatedTest;
 
-class AwsTracerProviderFactoryTest {
+class AwsTracerConfigurerTest {
 
-  private static final TracerProvider tracerProvider = new AwsTracerProviderFactory().create();
+  private static final TracerProvider tracerProvider;
+
+  static {
+    SdkTracerProviderBuilder builder = SdkTracerProvider.builder();
+    new AwsTracerConfigurer().configure(builder);
+    tracerProvider = builder.build();
+  }
 
   // The probability of this passing once without correct IDs is low, 20 times is inconceivable.
   @RepeatedTest(20)

…viders/AwsTracerProviderFactoryTest.java …t/providers/AwsTracerConfigurerTest.javaawsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerProviderFactoryTest.java renamed to awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerConfigurerTest.java awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerProviderFactoryTest.java renamed to awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerConfigurerTest.java

@@ -30,7 +30,7 @@ val DEPENDENCY_BOMS = listOf(
   "com.google.protobuf:protobuf-bom:3.14.0",
   "com.linecorp.armeria:armeria-bom:1.4.0",
   "io.grpc:grpc-bom:1.35.0",
-  "io.opentelemetry:opentelemetry-bom:0.14.1",
+  "io.opentelemetry:opentelemetry-bom:0.15.0",
   "org.apache.logging.log4j:log4j-bom:2.14.0",
   "org.junit:junit-bom:5.7.0",
   "org.springframework.boot:spring-boot-dependencies:2.4.2",
@@ -41,14 +41,15 @@ val DEPENDENCY_BOMS = listOf(
 val DEPENDENCY_SETS = listOf(
   DependencySet(
     "io.opentelemetry",
-    "0.14.1-alpha",
+    "0.15.0-alpha",
     listOf(
-      "opentelemetry-api-metrics"
+      "opentelemetry-api-metrics",
+      "opentelemetry-sdk-extension-autoconfigure"
     )
   ),
   DependencySet(
     "io.opentelemetry.javaagent",
-    "0.14.0",
+    "0.15.0",
     listOf(
       "opentelemetry-javaagent",
       "opentelemetry-javaagent-spi"

dependencyManagement/build.gradle.kts

@@ -117,7 +117,7 @@ public ExportTraceServiceRequest deserialize(
           .withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/opentelemetry-javaagent-all.jar")
           .withEnv("OTEL_BSP_MAX_EXPORT_BATCH", "1")
           .withEnv("OTEL_BSP_SCHEDULE_DELAY", "10")
-          .withEnv("OTEL_EXPORTER_OTLP_SPAN_ENDPOINT", "backend:8080");
+          .withEnv("OTEL_EXPORTER_OTLP_ENDPOINT", "http://backend:8080");
 
   private static final TypeReference<List<ExportTraceServiceRequest>>
       EXPORT_TRACE_SERVICE_REQUEST_LIST = new TypeReference<>() {};