fix: Make SentryScope.useSpan non-blocking #3568
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📜 Description
Instead of calling the callback of useSpan within the spanLock, get a reference to the span inside the critical sector and pass this to the callback after the critical sector closes. This way, when the callback is a blocking call, useSpan doesn't block other invocations of itself and prevents potential deadlocks.
💡 Motivation and Context
A customer reported a deadlock on macOS for which multiple threads pointed to acquiring locks to
SentryScope useSpan
.💚 How did you test it?
Unit tests.
📝 Checklist
You have to check all boxes before merging:
sendDefaultPII
is enabled.🔮 Next steps