Treat NoOpScopes same as null in OtelSentrySpanProcessor

adinauer · adinauer · commit d5d9775f4b07 · 2025-10-21T16:16:36.000+02:00
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)) {`