Merge 3565312 into d5a29b6

adinauer · web-flow · commit c588533edcc1 · 2025-10-22T07:19:26.000Z
diff --git 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
 - Session Replay: Do not use recycled screenshots for masking ([#4790](https://github.com/getsentry/sentry-java/pull/4790))
   - This fixes native crashes seen in `Canvas.<init>`/`ScreenshotRecorder.capture`
 
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
@@ -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)) {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public void onStart(final @NotNull Context parentContext, final @NotNull ReadWri`
`125`	`125`
`126`	`126`	`private IScopes forkScopes(final @NotNull Context context, final @NotNull SpanData span) {`
`127`	`127`	`final @Nullable IScopes scopesFromContext = context.get(SENTRY_SCOPES_KEY);`
`128`		`- if (scopesFromContext == null) {`
	`128`	`+ if (scopesFromContext == null \|\| scopesFromContext.isNoOp()) {`
`129`	`129`	`return Sentry.forkedRootScopes("spanprocessor.new");`
`130`	`130`	`}`
`131`	`131`	`if (isRootSpan(span)) {`