Merge 01121c4 into d5ff4e5

adinauer · web-flow · commit 4586bc7df479 · 2025-08-12T11:06:31.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### Unreleased
+
+### Fixes
+
+- Do not store No-Op scopes onto OpenTelemetry Context when wrapping ([#4631](https://github.com/getsentry/sentry-java/pull/4631))
+  - In 8.18.0 and 8.19.0 the SDK could break when initialized too late.
+
 ## 8.19.0
 
 ### Features
diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextWrapper.java b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextWrapper.java
@@ -47,7 +47,11 @@ private <V> boolean isOpentelemetrySpan(final @NotNull ContextKey<V> contextKey)
     if (sentrySpan != null) {
       forkedScopes.setActiveSpan(sentrySpan);
     }
-    return context.with(SENTRY_SCOPES_KEY, forkedScopes);
+    if (forkedScopes.isNoOp()) {
+      return context;
+    } else {
+      return context.with(SENTRY_SCOPES_KEY, forkedScopes);
+    }
   }
 
   private static @NotNull IScopes forkCurrentScopeInternal(
diff --git a/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/test/kotlin/io/sentry/opentelemetry/SentryContextWrapperTest.kt b/sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/test/kotlin/io/sentry/opentelemetry/SentryContextWrapperTest.kt
@@ -0,0 +1,20 @@
+package io.sentry.opentelemetry
+
+import io.opentelemetry.context.Context
+import io.sentry.Sentry
+import io.sentry.opentelemetry.SentryOtelKeys.SENTRY_SCOPES_KEY
+import junit.framework.TestCase.assertNull
+import junit.framework.TestCase.assertTrue
+import kotlin.test.Test
+
+class SentryContextWrapperTest {
+
+  @Test
+  fun `ensure noop scopes are not stored on Context`() {
+    val context = Context.root()
+    assertNull(context.get(SENTRY_SCOPES_KEY))
+    assertTrue(Sentry.getCurrentScopes().isNoOp)
+    val wrappedContext = SentryContextWrapper.wrap(context)
+    assertNull(wrappedContext.get(SENTRY_SCOPES_KEY))
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,11 @@ private <V> boolean isOpentelemetrySpan(final @NotNull ContextKey<V> contextKey)`
`47`	`47`	`if (sentrySpan != null) {`
`48`	`48`	`forkedScopes.setActiveSpan(sentrySpan);`
`49`	`49`	`}`
`50`		`- return context.with(SENTRY_SCOPES_KEY, forkedScopes);`
	`50`	`+ if (forkedScopes.isNoOp()) {`
	`51`	`+ return context;`
	`52`	`+ } else {`
	`53`	`+ return context.with(SENTRY_SCOPES_KEY, forkedScopes);`
	`54`	`+ }`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`private static @NotNull IScopes forkCurrentScopeInternal(`