Merge/v2.11.x (#1087)

*Issue #, if available:*

We have done the ADOT Java v2.11.0 and as part of the process, we need
to merge the changes we made for this release back to the main branch.

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

*Description of changes:*
* Using GH UI created a new branch based on release/v.2.11.x
* Using GH UI created this PR to main
* Update otelSnapshotVersion to 2.12.0 in
`aws-otel-java-instrumentation.patch` and
`dependencyManagement/build.gradle.kts`
* Rebased from main

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

---------

Co-authored-by: Michael He <53622546+yiyuan-he@users.noreply.github.com>
Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com>

Author: 3 people

.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,8 +27,8 @@ 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 otelSnapshotVersion = "2.11.0"
+val otelVersion = "2.11.0-adot1"
+val otelSnapshotVersion = "2.12.0"
 val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
 val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
 // All versions below are only used in testing and do not affect the released artifact.

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,10 @@ public static void onExit(
       if (contextData == null) {
         contextData = spanContextData;
       } else {
-        contextData = new UnionMap<>(contextData, spanContextData);
+        // Merge maps with UnionMap semantics: contextData values take precedence
+        Map<String, String> mergedData = new HashMap<>(spanContextData);
+        mergedData.putAll(contextData);
+        contextData = mergedData;
       }
     }
   }

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

@@ -6,8 +6,8 @@ index 9493189..6090207 100644
  val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
  // This is the version of the upstream instrumentation BOM
--val otelVersion = "2.10.0-adot2"
-+val otelVersion = "2.10.0-adot-lambda1"
- val otelSnapshotVersion = "2.11.0"
+-val otelVersion = "2.11.0-adot1"
++val otelVersion = "2.11.0-adot-lambda1"
+ val otelSnapshotVersion = "2.12.0"
  val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
- val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
+ val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"

lambda-layer/patches/aws-otel-java-instrumentation.patch

@@ -310,10 +310,10 @@ index 7900c9a4d9..80383d7c22 100644
 --- a/version.gradle.kts
 +++ b/version.gradle.kts
 @@ -1,5 +1,5 @@
--val stableVersion = "2.10.0-adot2"
--val alphaVersion = "2.10.0-adot2-alpha"
-+val stableVersion = "2.10.0-adot-lambda1"
-+val alphaVersion = "2.10.0-adot-lambda1-alpha"
+-val stableVersion = "2.11.0-adot1"
+-val alphaVersion = "2.11.0-adot1-alpha"
++val stableVersion = "2.11.0-adot-lambda1"
++val alphaVersion = "2.11.0-adot-lambda1-alpha"
 
  allprojects {
-   if (findProperty("otel.stable") != "true") {
+   if (findProperty("otel.stable") != "true") {