Update dependencies and OTel to v2.11.0-adot1

Author: yiyuan-he

.github/patches/opentelemetry-java-instrumentation.patch

@@ -1 +1 @@
-OTEL_JAVA_INSTRUMENTATION_VERSION=v2.10.0
+OTEL_JAVA_INSTRUMENTATION_VERSION=v2.11.0

.github/patches/versions

@@ -27,7 +27,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
 // This is the version of the upstream instrumentation BOM
-val otelVersion = "2.10.0-adot2"
+val otelVersion = "2.11.0-adot1"
 val otelSnapshotVersion = "2.11.0"
 val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
 val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"

dependencyManagement/build.gradle.kts

@@ -26,7 +26,6 @@
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.util.VirtualField;
-import io.opentelemetry.instrumentation.logback.mdc.v1_0.internal.UnionMap;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -93,7 +92,9 @@ public static void onExit(
       if (contextData == null) {
         contextData = spanContextData;
       } else {
-        contextData = new UnionMap<>(contextData, spanContextData);
+        Map<String, String> mergedData = new HashMap<>(contextData);
+        mergedData.putAll(spanContextData);
+        contextData = mergedData;
       }
     }
   }