From d5d9775f4b07dcf9e9add50937796c8a0ba3a18d Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 21 Oct 2025 16:16:36 +0200 Subject: [PATCH 1/3] Treat NoOpScopes same as null in OtelSentrySpanProcessor --- .../java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java index bb374f4a51..1cf6fa5d83 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java +++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java @@ -125,7 +125,7 @@ public void onStart(final @NotNull Context parentContext, final @NotNull ReadWri private IScopes forkScopes(final @NotNull Context context, final @NotNull SpanData span) { final @Nullable IScopes scopesFromContext = context.get(SENTRY_SCOPES_KEY); - if (scopesFromContext == null) { + if (scopesFromContext == null || scopesFromContext.isNoOp()) { return Sentry.forkedRootScopes("spanprocessor.new"); } if (isRootSpan(span)) { From eacee9198407a5e9c47875fdafcaa4f76692f01c Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 22 Oct 2025 09:18:27 +0200 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bd989eafd..02b17b4254 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,8 @@ - Session Replay: Avoid deadlock when pausing replay if no connection ([#4788](https://github.com/getsentry/sentry-java/pull/4788)) - Session Replay: Fix capturing roots with no windows ([#4805](https://github.com/getsentry/sentry-java/pull/4805)) - Session Replay: Fix `java.lang.IllegalArgumentException: width and height must be > 0` ([#4805](https://github.com/getsentry/sentry-java/pull/4805)) +- Handle `NoOpScopes` in `Context` when starting a span through OpenTelemetry ([#4823](https://github.com/getsentry/sentry-java/pull/4823)) + - This fixes "java.lang.IllegalArgumentException: The DSN is required" when combining WebFlux and OpenTelemetry ### Miscellaneous From 7a251191b4230a30336e8ed3ee1fccfa92526e46 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 22 Oct 2025 09:40:25 +0200 Subject: [PATCH 3/3] reset latest changelog entries to unreleased --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a190fd6c4..2983d5e19c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 8.24.0-alpha.2 +## Unreleased ### Features