Skip to content

Update main branch from the v2.11.0 release #1086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Update main branch from the v2.11.0 release #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1c15a8
Update dependencies and OTel to v2.11.0-adot1 (#1083)
yiyuan-he May 23, 2025
60cab1e
Empty commit to trigger main build (#1084)
yiyuan-he May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
393 changes: 219 additions & 174 deletions .github/patches/opentelemetry-java-instrumentation.patch
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/patches/versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.10.0
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.11.0
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions ...entelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions lambda-layer/patches/aws-otel-java-instrumentation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 otelVersion = "2.11.0-adot1"
+val otelVersion = "2.11.0-adot-lambda1"
val otelSnapshotVersion = "2.11.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"
10 changes: 5 additions & 5 deletions lambda-layer/patches/opentelemetry-java-instrumentation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
206 changes: 0 additions & 206 deletions licenses/annotations-2.29.23.jar/META-INF/LICENSE.txt
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions licenses/annotations-2.29.23.jar/META-INF/NOTICE.txt
View file
Open in desktop

This file was deleted.

Loading
Loading