Update to OTel 1.10 (#137)

* Update to OTel 1.10

* Update other dependencies.

* Update licenses

Author: Anuraag Agrawal

dependencyManagement/build.gradle.kts

@@ -26,38 +26,38 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 
 val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
-val otelVersion = "1.9.1"
-val otelSnapshotVersion = "1.10.0"
+val otelVersion = "1.10.0"
+val otelSnapshotVersion = "1.11.0"
 
 val DEPENDENCY_BOMS = listOf(
-  "com.amazonaws:aws-java-sdk-bom:1.12.129",
-  "com.fasterxml.jackson:jackson-bom:2.13.0",
+  "com.amazonaws:aws-java-sdk-bom:1.12.141",
+  "com.fasterxml.jackson:jackson-bom:2.13.1",
   "com.google.guava:guava-bom:31.0.1-jre",
-  "com.google.protobuf:protobuf-bom:3.19.1",
+  "com.google.protobuf:protobuf-bom:3.19.3",
   "com.linecorp.armeria:armeria-bom:1.13.4",
   "io.grpc:grpc-bom:1.42.1",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
-  "org.apache.logging.log4j:log4j-bom:2.17.0",
+  "org.apache.logging.log4j:log4j-bom:2.17.1",
   "org.junit:junit-bom:5.8.2",
-  "org.springframework.boot:spring-boot-dependencies:2.6.1",
+  "org.springframework.boot:spring-boot-dependencies:2.6.2",
   "org.testcontainers:testcontainers-bom:1.16.2",
-  "software.amazon.awssdk:bom:2.17.100"
+  "software.amazon.awssdk:bom:2.17.112"
 )
 
 val DEPENDENCY_SETS = listOf(
   DependencySet(
     "org.assertj",
-    "3.21.0",
+    "3.22.0",
     listOf("assertj-core")
   ),
   DependencySet(
     "org.curioswitch.curiostack",
-    "1.2.0",
+    "2.0.0",
     listOf("protobuf-jackson")
   ),
   DependencySet(
     "org.slf4j",
-    "1.7.32",
+    "1.7.33",
     listOf(
       "slf4j-api",
       "slf4j-simple"
@@ -72,7 +72,7 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.contrib:opentelemetry-aws-xray:1.9.0",
   "io.opentelemetry.proto:opentelemetry-proto:0.11.0-alpha",
   "io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"}",
-  "net.bytebuddy:byte-buddy:1.12.3"
+  "net.bytebuddy:byte-buddy:1.12.7"
 )
 
 javaPlatform {

instrumentation/log4j-2.13.2/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/log4j_2_13_2/AwsXrayLog4jInstrumentationModule.java

@@ -18,6 +18,7 @@
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
+import io.opentelemetry.javaagent.extension.instrumentation.HelperResourceBuilder;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -41,6 +42,12 @@ public List<String> getAdditionalHelperClassNames() {
             + "AwsXrayContextDataProvider");
   }
 
+  @Override
+  public void registerHelperResources(HelperResourceBuilder helperResourceBuilder) {
+    helperResourceBuilder.register(
+        "META-INF/services/org.apache.logging.log4j.core.util.ContextDataProvider");
+  }
+
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     return hasClassesNamed("org.apache.logging.log4j.core.util.ContextDataProvider");

instrumentation/logback-1.0/build.gradle.kts

@@ -22,7 +22,7 @@ base.archivesBaseName = "aws-instrumentation-logback-1.0"
 
 dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api")
-  compileOnly("io.opentelemetry.instrumentation:opentelemetry-logback-1.0")
+  compileOnly("io.opentelemetry.instrumentation:opentelemetry-logback-mdc-1.0")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api")
   compileOnly("net.bytebuddy:byte-buddy")