From ef53b09314d51c233063d5781039cded3c0c801b Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2026 09:08:06 +0000 Subject: [PATCH 1/4] build(opentelemetry): Bump OpenTelemetry dependencies to 2.34.0 --- CHANGELOG.md | 10 ++++++++++ gradle/libs.versions.toml | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9472ec4027..9aa7a049d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,16 @@ - Kotlin now sees `Attachment.getBytes()`, `Device.getArchs()`, `Spring.getActiveProfiles()` and `JsonSerializationUtils.bytesFrom(...)` as nullable, because `@Nullable` now annotates the returned array instead of its elements ([#6558](https://github.com/getsentry/sentry-java/pull/6558)) - Shake-to-report no longer leaks the first Activity that resumes after `Sentry.init` ([#6686](https://github.com/getsentry/sentry-java/pull/6686)) +### Dependencies + +- Bump OpenTelemetry ([#PRNUM](https://github.com/getsentry/sentry-java/pull/PRNUM)) + - `opentelemetry` to `1.68.0` (was `1.67.0`) + - `opentelemetry-alpha` to `1.68.0-alpha` (was `1.67.0-alpha`) + - `opentelemetry-instrumentation` to `2.34.0` (was `2.33.1`) + - `opentelemetry-instrumentation-alpha` to `2.34.0-alpha` (was `2.33.1-alpha`) + - `opentelemetry-semconv` to `1.45.0` (was `1.44.0`) + - `opentelemetry-semconv-alpha` to `1.45.0-alpha` (was `1.44.0-alpha`) + ## 8.65.0 ### Features diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 56c294c6ad..522943d7c5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,13 +30,13 @@ nopen = "1.0.1" # see https://developer.android.com/jetpack/androidx/releases/compose-kotlin okhttp = "5.5.1" openfeature = "1.18.2" -otel = "1.67.0" -otelAlpha = "1.67.0-alpha" -otelInstrumentation = "2.33.1" -otelInstrumentationAlpha = "2.33.1-alpha" +otel = "1.68.0" +otelAlpha = "1.68.0-alpha" +otelInstrumentation = "2.34.0" +otelInstrumentationAlpha = "2.34.0-alpha" # check https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/dependencyManagement/build.gradle.kts#L49 for release version above to find a compatible version -otelSemanticConventions = "1.44.0" -otelSemanticConventionsAlpha = "1.44.0-alpha" +otelSemanticConventions = "1.45.0" +otelSemanticConventionsAlpha = "1.45.0-alpha" retrofit = "3.0.0" room2 = "2.8.5" room3 = "3.0.3" From cdfd4ce6374325de54e25ffda80f073c8a007479 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2026 09:08:55 +0000 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aa7a049d1..08ae6ec654 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ ### Dependencies -- Bump OpenTelemetry ([#PRNUM](https://github.com/getsentry/sentry-java/pull/PRNUM)) +- Bump OpenTelemetry ([#6691](https://github.com/getsentry/sentry-java/pull/6691)) - `opentelemetry` to `1.68.0` (was `1.67.0`) - `opentelemetry-alpha` to `1.68.0-alpha` (was `1.67.0-alpha`) - `opentelemetry-instrumentation` to `2.34.0` (was `2.33.1`) From 046fc1f1823a46fbed92f109cd9191f184feab0a Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2026 10:55:54 +0000 Subject: [PATCH 3/4] fix(opentelemetry): Read both messaging.system and messaging.system.name Co-Authored-By: Alexander Dinauer --- .../sentry/opentelemetry/SentrySpanExporter.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java index 93b11eff4a..d54a3e8cd6 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java +++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java @@ -362,8 +362,7 @@ private void transferSpanDetails( maybeTransferOtelAttribute(span, sentryTransaction, ThreadIncubatingAttributes.THREAD_ID); maybeTransferOtelAttribute(span, sentryTransaction, ThreadIncubatingAttributes.THREAD_NAME); - maybeTransferOtelAttribute( - span, sentryTransaction, MessagingIncubatingAttributes.MESSAGING_SYSTEM); + transferMessagingSystem(span, sentryTransaction); maybeTransferOtelAttribute( span, sentryTransaction, MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME); maybeTransferOtelAttribute( @@ -382,6 +381,18 @@ private void transferSpanDetails( return sentryTransaction; } + /** + * {@code messaging.system} is deprecated in favor of {@code messaging.system.name}. + * Instrumentation may set either, so both are transferred. + */ + @SuppressWarnings("deprecation") + private static void transferMessagingSystem( + final @NotNull SpanData span, final @NotNull ISpan sentrySpan) { + maybeTransferOtelAttribute(span, sentrySpan, MessagingIncubatingAttributes.MESSAGING_SYSTEM); + maybeTransferOtelAttribute( + span, sentrySpan, MessagingIncubatingAttributes.MESSAGING_SYSTEM_NAME); + } + private List findCompletedRootNodes(final @NotNull List grouped) { final @NotNull Predicate isRootPredicate = node -> { From 14621e2fbe68b435797a28239a05acf776e2aed8 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2026 11:06:40 +0000 Subject: [PATCH 4/4] fix(opentelemetry): Transfer messaging.system.name to messaging.system Co-Authored-By: Alexander Dinauer --- .../opentelemetry/SentrySpanExporter.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java index d54a3e8cd6..9f039b2f5b 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java +++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java @@ -382,15 +382,24 @@ private void transferSpanDetails( } /** - * {@code messaging.system} is deprecated in favor of {@code messaging.system.name}. - * Instrumentation may set either, so both are transferred. + * OpenTelemetry deprecated {@code messaging.system} in favor of {@code messaging.system.name}, + * but Sentry only supports {@code messaging.system}. Instrumentation may set either, so the value + * is transferred to {@code messaging.system}, preferring {@code messaging.system} if both are + * set. */ @SuppressWarnings("deprecation") private static void transferMessagingSystem( final @NotNull SpanData span, final @NotNull ISpan sentrySpan) { - maybeTransferOtelAttribute(span, sentrySpan, MessagingIncubatingAttributes.MESSAGING_SYSTEM); - maybeTransferOtelAttribute( - span, sentrySpan, MessagingIncubatingAttributes.MESSAGING_SYSTEM_NAME); + final @NotNull Attributes attributes = span.getAttributes(); + final @Nullable String deprecatedMessagingSystem = + attributes.get(MessagingIncubatingAttributes.MESSAGING_SYSTEM); + final @Nullable String messagingSystem = + deprecatedMessagingSystem != null + ? deprecatedMessagingSystem + : attributes.get(MessagingIncubatingAttributes.MESSAGING_SYSTEM_NAME); + if (messagingSystem != null) { + sentrySpan.setData(MessagingIncubatingAttributes.MESSAGING_SYSTEM.getKey(), messagingSystem); + } } private List findCompletedRootNodes(final @NotNull List grouped) {