Update to OTel 1.2.0 (#58)

* Update to OTel 1.2.0 * Regenerate licenses
aws-observability · May 19, 2021 · 86e0e57 · 86e0e57
1 parent 1db7442
commit 86e0e57
Show file tree

Hide file tree

Showing 8 changed files with 176 additions and 182 deletions.
diff --git a/awsagentprovider/build.gradle.kts b/awsagentprovider/build.gradle.kts
@@ -23,7 +23,7 @@ base {
 }
 
 dependencies {
-  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-spi")
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   compileOnly("org.slf4j:slf4j-api")
 

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -27,18 +27,18 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
 val DEPENDENCY_BOMS = listOf(
-  "com.amazonaws:aws-java-sdk-bom:1.11.1001",
+  "com.amazonaws:aws-java-sdk-bom:1.11.1020",
   "com.fasterxml.jackson:jackson-bom:2.12.3",
   "com.google.guava:guava-bom:30.1.1-jre",
-  "com.google.protobuf:protobuf-bom:3.15.8",
-  "com.linecorp.armeria:armeria-bom:1.6.0",
-  "io.grpc:grpc-bom:1.37.0",
-  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "1.1.0-alpha" else "1.2.0-alpha-SNAPSHOT"}",
+  "com.google.protobuf:protobuf-bom:3.17.0",
+  "com.linecorp.armeria:armeria-bom:1.7.2",
+  "io.grpc:grpc-bom:1.37.1",
+  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "1.2.0-alpha" else "1.3.0-alpha-SNAPSHOT"}",
   "org.apache.logging.log4j:log4j-bom:2.14.1",
-  "org.junit:junit-bom:5.7.1",
+  "org.junit:junit-bom:5.7.2",
   "org.springframework.boot:spring-boot-dependencies:2.4.5",
   "org.testcontainers:testcontainers-bom:1.15.3",
-  "software.amazon.awssdk:bom:2.16.44"
+  "software.amazon.awssdk:bom:2.16.64"
 )
 
 val DEPENDENCY_SETS = listOf(
@@ -66,7 +66,7 @@ val DEPENDENCIES = listOf(
   "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.3",
   "com.squareup.okhttp3:okhttp:4.9.1",
-  "io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) "1.1.0" else "1.2.0-SNAPSHOT"}",
+  "io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) "1.2.0" else "1.3.0-SNAPSHOT"}",
   "net.bytebuddy:byte-buddy:1.11.0"
 )
 

diff --git a/instrumentation/log4j-2.13.2/build.gradle.kts b/instrumentation/log4j-2.13.2/build.gradle.kts
@@ -22,7 +22,7 @@ base.archivesBaseName = "aws-instrumentation-log4j-2.13.2"
 
 dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api")
-  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
   compileOnly("net.bytebuddy:byte-buddy")
 
   compileOnly("org.apache.logging.log4j:log4j-core:2.13.2")

diff --git a/...entelemetry/javaagent/instrumentation/log4j_2_13_2/AwsXrayLog4jInstrumentationModule.java b/...entelemetry/javaagent/instrumentation/log4j_2_13_2/AwsXrayLog4jInstrumentationModule.java
@@ -15,11 +15,11 @@
 
 package software.amazon.opentelemetry.javaagent.instrumentation.log4j_2_13_2;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +36,7 @@ public AwsXrayLog4jInstrumentationModule() {
   // The SPI will be merged with what's in the agent so we don't need to inject it, only our
   // provider implementation.
   @Override
-  protected String[] additionalHelperClassNames() {
+  public String[] helperResourceNames() {
     return new String[] {
       "software.amazon.opentelemetry.javaagent.instrumentation.log4j_2_13_2."
           + "AwsXrayContextDataProvider"

diff --git a/instrumentation/logback-1.0/build.gradle.kts b/instrumentation/logback-1.0/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api")
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-logback-1.0")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-api")
-  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
   compileOnly("net.bytebuddy:byte-buddy")
 
   compileOnly("ch.qos.logback:logback-classic:1.0.0")

diff --git a/...ntelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLogbackInstrumentationModule.java b/...ntelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLogbackInstrumentationModule.java
@@ -16,8 +16,8 @@
 package software.amazon.opentelemetry.javaagent.instrumentation.logback_1_0;
 
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

diff --git a/...entelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java b/...entelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java
@@ -15,8 +15,8 @@
 
 package software.amazon.opentelemetry.javaagent.instrumentation.logback_1_0;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
@@ -27,8 +27,8 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.instrumentation.logback.v1_0.internal.UnionMap;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Collections;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;