Update to OTel 1.4.0 (#64)

aws-observability · Jul 22, 2021 · 076f6e7 · 076f6e7
1 parent 497f57f
commit 076f6e7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/...r/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsAgentProperties.java b/...r/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsAgentProperties.java
@@ -15,11 +15,11 @@
 
 package software.amazon.opentelemetry.javaagent.providers;
 
-import io.opentelemetry.javaagent.spi.config.PropertySource;
+import io.opentelemetry.javaagent.extension.config.ConfigPropertySource;
 import java.util.HashMap;
 import java.util.Map;
 
-public class AwsAgentProperties implements PropertySource {
+public class AwsAgentProperties implements ConfigPropertySource {
   @Override
   public Map<String, String> getProperties() {
     Map<String, String> properties = new HashMap<>();

diff --git a/...metry.javaagent.spi.config.PropertySource → ...ent.extension.config.ConfigPropertySource b/...metry.javaagent.spi.config.PropertySource → ...ent.extension.config.ConfigPropertySource
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -33,7 +33,7 @@ val DEPENDENCY_BOMS = listOf(
   "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.3.1-alpha" else "1.4.0-alpha-SNAPSHOT"}",
+  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "1.4.0-alpha" else "1.5.0-alpha-SNAPSHOT"}",
   "org.apache.logging.log4j:log4j-bom:2.14.1",
   "org.junit:junit-bom:5.7.2",
   "org.springframework.boot:spring-boot-dependencies:2.4.5",
@@ -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.3.1" else "1.4.0-SNAPSHOT"}",
+  "io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) "1.4.0" else "1.5.0-SNAPSHOT"}",
   "net.bytebuddy:byte-buddy:1.11.0"
 )
 

diff --git a/...entelemetry/javaagent/instrumentation/log4j_2_13_2/AwsXrayLog4jInstrumentationModule.java b/...entelemetry/javaagent/instrumentation/log4j_2_13_2/AwsXrayLog4jInstrumentationModule.java
@@ -15,7 +15,7 @@
 
 package software.amazon.opentelemetry.javaagent.instrumentation.log4j_2_13_2;
 
-import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;

diff --git a/instrumentation/logback-1.0/build.gradle.kts b/instrumentation/logback-1.0/build.gradle.kts
@@ -23,8 +23,8 @@ base.archivesBaseName = "aws-instrumentation-logback-1.0"
 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-extension-api")
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api")
   compileOnly("net.bytebuddy:byte-buddy")
 
   compileOnly("ch.qos.logback:logback-classic:1.0.0")

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.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
-import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;