Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixes

- Fix deadlock in `SentryContextStorage.root()` with virtual threads and OpenTelemetry agent ([#5234](https://github.com/getsentry/sentry-java/pull/5234))

## 8.37.0

### Fixes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ public Context current() {

@Override
public Context root() {
return SentryContextWrapper.wrap(ContextStorage.super.root());
// Don't wrap() here โ€” it triggers scope.clone() which acquires locks. Under virtual
// threads, lock.unlock() can re-enter here via OpenTelemetry executor instrumentation, causing
// a deadlock.
return ContextStorage.super.root();
}
}
Loading