Skip to content

Handle NoOpScopes in Context when starting a span through OpenTelemetry #4823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 22, 2025
+4 −2
Merged

Handle NoOpScopes in Context when starting a span through OpenTelemetry #4823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5d9775
Treat NoOpScopes same as null in OtelSentrySpanProcessor
adinauer Oct 21, 2025
eacee91
changelog
adinauer Oct 22, 2025
3565312
Merge branch 'main' into fix/handle-noop-scopes-in-span-processor
adinauer Oct 22, 2025
7a25119
reset latest changelog entries to unreleased
adinauer Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 8.24.0-alpha.2
## Unreleased

### Features

Expand Down Expand Up @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion ...try-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
Loading