Update dependencies to release ADOT Java 1.23.0 (#344)

* Update dependencies to release ADOT Java 1.23.0
* Inject Trace ID directly through MDC in logback
* Update Integration Tests to account for changes in Span names

Signed-off-by: Raphael Silva <[email protected]>

---------

Signed-off-by: Raphael Silva <[email protected]>

Author: rapphil

dependencyManagement/build.gradle.kts

@@ -27,30 +27,30 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
 // This is the version of the upstream instrumentation BOM
-val otelVersion = "1.21.0"
-val otelSnapshotVersion = "1.22.0"
+val otelVersion = "1.23.0"
+val otelSnapshotVersion = "1.24.0"
 
 // All versions below are only used in testing and do not affect the released artifact.
 
 val DEPENDENCY_BOMS = listOf(
-  "com.amazonaws:aws-java-sdk-bom:1.12.415",
-  "com.fasterxml.jackson:jackson-bom:2.14.1",
+  "com.amazonaws:aws-java-sdk-bom:1.12.416",
+  "com.fasterxml.jackson:jackson-bom:2.14.2",
   "com.google.guava:guava-bom:31.1-jre",
-  "com.google.protobuf:protobuf-bom:3.21.12",
-  "com.linecorp.armeria:armeria-bom:1.21.0",
+  "com.google.protobuf:protobuf-bom:3.22.0",
+  "com.linecorp.armeria:armeria-bom:1.22.1",
   "io.grpc:grpc-bom:1.53.0",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
-  "org.apache.logging.log4j:log4j-bom:2.19.0",
-  "org.junit:junit-bom:5.9.1",
+  "org.apache.logging.log4j:log4j-bom:2.20.0",
+  "org.junit:junit-bom:5.9.2",
   "org.springframework.boot:spring-boot-dependencies:2.7.9",
   "org.testcontainers:testcontainers-bom:1.17.6",
-  "software.amazon.awssdk:bom:2.20.12"
+  "software.amazon.awssdk:bom:2.20.13"
 )
 
 val DEPENDENCY_SETS = listOf(
   DependencySet(
     "org.assertj",
-    "3.23.1",
+    "3.24.2",
     listOf("assertj-core")
   ),
   DependencySet(
@@ -72,11 +72,11 @@ val DEPENDENCIES = listOf(
   "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.4",
   "com.squareup.okhttp3:okhttp:4.10.0",
-  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.21.0",
-  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.21.0-alpha",
+  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.23.0",
+  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.23.0-alpha",
   "io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha",
   "io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"}",
-  "net.bytebuddy:byte-buddy:1.12.22"
+  "net.bytebuddy:byte-buddy:1.14.0"
 )
 
 javaPlatform {

instrumentation/logback-1.0/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java

@@ -26,16 +26,15 @@
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.util.VirtualField;
-import io.opentelemetry.instrumentation.logback.v1_0.internal.UnionMap;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import java.util.Collections;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.implementation.bytecode.assign.Assigner.Typing;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.slf4j.MDC;
 
 public class AwsXrayLoggingEventInstrumentation implements TypeInstrumentation {
   private static final String TRACE_ID_KEY = "AWS-XRAY-TRACE-ID";
@@ -77,6 +76,8 @@ public static void onExit(
 
       SpanContext spanContext = Java8BytecodeBridge.spanFromContext(context).getSpanContext();
       if (!spanContext.isValid()) {
+        // Remove any remaining trace id from the MDC
+        MDC.remove(TRACE_ID_KEY);
         return;
       }
 
@@ -88,13 +89,7 @@ public static void onExit(
               + "@"
               + spanContext.getSpanId();
 
-      Map<String, String> spanContextData = Collections.singletonMap(TRACE_ID_KEY, value);
-
-      if (contextData == null) {
-        contextData = spanContextData;
-      } else {
-        contextData = new UnionMap<>(contextData, spanContextData);
-      }
+      MDC.put(TRACE_ID_KEY, value);
     }
   }
 }