diff --git a/CHANGELOG.md b/CHANGELOG.md index dcd869eddb..2983d5e19c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 8.24.0-alpha.2 +## Unreleased ### Features @@ -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.`/`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 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)) {