fix: TOCTOU race between session life-cycle and event capture #1377
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Sep 17, 2025
mujacica
approved these changes
Sep 17, 2025
Co-authored-by: Amir Mujacic <amir.mujacic@sentry.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This issue more regularly appeared in the
concurrent_inittest in recent CI runs and was an actual race.We update the session if one is active inside a mutable options lock when capturing events. However, the check happened outside the lock. Concurrent session shutdown could mutate the session concurrently.
This PR fixes the race with a recheck inside the lock and a TSAN annotation around the optimistic read outside the lock.