Skip to content

Commit f1c15a8

Browse files
yiyuan-heADOT Patch workflow
yiyuan-he
and
ADOT Patch workflow
authored
Update dependencies and OTel to v2.11.0-adot1 (#1083)
### What does this pull request do? Updating patch for `v2.10.0` to `v2.11.0` bump. Reference for how this patch was created: yiyuan-he/opentelemetry-java-instrumentation#1 ``` The following dependencies are using the latest release version: - com.sparkjava:spark-core:2.9.4 - com.squareup.okhttp3:okhttp:4.12.0 - io.opentelemetry:opentelemetry-extension-aws:1.20.1 The following dependencies have later release versions: - com.amazonaws:aws-java-sdk-bom [1.12.599 -> 1.12.783] https://aws.amazon.com/sdkforjava - com.fasterxml.jackson:jackson-bom [2.16.0 -> 2.19.0] https://github.com/FasterXML/jackson-bom - com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin [0.50.0 -> 0.52.0] - com.google.guava:guava-bom [33.0.0-jre -> 33.4.8-jre] https://github.com/google/guava - com.google.protobuf:protobuf-bom [3.25.1 -> 4.31.0] https://developers.google.com/protocol-buffers/ - com.linecorp.armeria:armeria-bom [1.26.4 -> 1.32.5] https://armeria.dev/ - commons-logging:commons-logging [1.2 -> 1.3.5] https://commons.apache.org/proper/commons-logging/ - io.grpc:grpc-bom [1.59.1 -> 1.72.0] https://github.com/grpc/grpc-java - io.opentelemetry.contrib:opentelemetry-aws-resources [1.39.0-alpha -> 1.46.0-alpha] https://github.com/open-telemetry/opentelemetry-java-contrib - io.opentelemetry.contrib:opentelemetry-aws-xray [1.39.0 -> 1.46.0] https://github.com/open-telemetry/opentelemetry-java-contrib - io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha [2.11.0-adot1-alpha -> 2.16.0-alpha] https://github.com/open-telemetry/opentelemetry-java-instrumentation - io.opentelemetry.javaagent:opentelemetry-javaagent [2.11.0-adot1 -> 2.16.0] https://github.com/open-telemetry/opentelemetry-java-instrumentation - io.opentelemetry.proto:opentelemetry-proto [1.0.0-alpha -> 1.7.0-alpha] https://github.com/open-telemetry/opentelemetry-proto-java - net.bytebuddy:byte-buddy [1.14.10 -> 1.17.5] https://bytebuddy.net - org.apache.logging.log4j:log4j-bom [2.21.1 -> 2.24.3] https://logging.apache.org/log4j/2.x/ - org.assertj:assertj-core [3.24.2 -> 3.27.3] https://assertj.github.io/doc/#assertj-core - org.curioswitch.curiostack:protobuf-jackson [2.2.0 -> 2.7.0] https://github.com/curioswitch/protobuf-jackson - org.junit:junit-bom [5.10.1 -> 5.12.2] https://junit.org/junit5/ - org.slf4j:slf4j-api [1.7.36 -> 2.0.17] http://www.slf4j.org - org.slf4j:slf4j-simple [1.7.36 -> 2.0.17] http://www.slf4j.org - org.springframework.boot:spring-boot-dependencies [2.7.17 -> 3.5.0] https://spring.io/projects/spring-boot - org.testcontainers:testcontainers-bom [1.19.3 -> 1.21.0] https://java.testcontainers.org - software.amazon.awssdk:bom [2.21.33 -> 2.31.49] https://aws.amazon.com/sdkforjava Gradle release-candidate updates: - Gradle: [8.10 -> 8.14.1] ``` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: ADOT Patch workflow <[email protected]>
1 parent f1c1507 commit f1c15a8

File tree

70 files changed

+599
-7950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+599
-7950
lines changed

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

Lines changed: 219 additions & 174 deletions
Large diffs are not rendered by default.

‎.github/patches/versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.10.0
1+
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.11.0

‎dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
2727
val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"
2828

2929
// This is the version of the upstream instrumentation BOM
30-
val otelVersion = "2.10.0-adot2"
30+
val otelVersion = "2.11.0-adot1"
3131
val otelSnapshotVersion = "2.11.0"
3232
val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
3333
val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import io.opentelemetry.api.trace.SpanContext;
2727
import io.opentelemetry.context.Context;
2828
import io.opentelemetry.instrumentation.api.util.VirtualField;
29-
import io.opentelemetry.instrumentation.logback.mdc.v1_0.internal.UnionMap;
3029
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
3130
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
3231
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -93,7 +92,10 @@ public static void onExit(
9392
if (contextData == null) {
9493
contextData = spanContextData;
9594
} else {
96-
contextData = new UnionMap<>(contextData, spanContextData);
95+
// Merge maps with UnionMap semantics: contextData values take precedence
96+
Map<String, String> mergedData = new HashMap<>(spanContextData);
97+
mergedData.putAll(contextData);
98+
contextData = mergedData;
9799
}
98100
}
99101
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ index 9493189..6090207 100644
66
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
77

88
// This is the version of the upstream instrumentation BOM
9-
-val otelVersion = "2.10.0-adot2"
10-
+val otelVersion = "2.10.0-adot-lambda1"
9+
-val otelVersion = "2.11.0-adot1"
10+
+val otelVersion = "2.11.0-adot-lambda1"
1111
val otelSnapshotVersion = "2.11.0"
1212
val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
13-
val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
13+
val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"

‎lambda-layer/patches/opentelemetry-java-instrumentation.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,10 @@ index 7900c9a4d9..80383d7c22 100644
310310
--- a/version.gradle.kts
311311
+++ b/version.gradle.kts
312312
@@ -1,5 +1,5 @@
313-
-val stableVersion = "2.10.0-adot2"
314-
-val alphaVersion = "2.10.0-adot2-alpha"
315-
+val stableVersion = "2.10.0-adot-lambda1"
316-
+val alphaVersion = "2.10.0-adot-lambda1-alpha"
313+
-val stableVersion = "2.11.0-adot1"
314+
-val alphaVersion = "2.11.0-adot1-alpha"
315+
+val stableVersion = "2.11.0-adot-lambda1"
316+
+val alphaVersion = "2.11.0-adot-lambda1-alpha"
317317

318318
allprojects {
319-
if (findProperty("otel.stable") != "true") {
319+
if (findProperty("otel.stable") != "true") {

‎licenses/annotations-2.29.23.jar/META-INF/LICENSE.txt

Lines changed: 0 additions & 206 deletions
This file was deleted.

‎licenses/annotations-2.29.23.jar/META-INF/NOTICE.txt

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)