fix(native): preserve attachments added during crash handling#1687
Merged
tustanivsky merged 4 commits intomasterfrom Apr 29, 2026
Merged
fix(native): preserve attachments added during crash handling#1687tustanivsky merged 4 commits intomasterfrom
tustanivsky merged 4 commits intomasterfrom
Conversation
jpnurmi
reviewed
Apr 29, 2026
mujacica
approved these changes
Apr 29, 2026
jpnurmi
approved these changes
Apr 29, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Attachments registered from
on_crash/before_sendare not delivered to the daemon under the native backend because the scope-flush path that writes<run>/__sentry-attachmentsis gated bystate->crashed(#1668) once the crash handler runs. As a result, the daemon assembles the envelope from a stale manifest and the attachments are silently dropped.This PR narrows the gate to cover only the event JSON write. The manifest write is extracted into a helper and runs on both the pre-crash and post-crash paths inside
native_backend_flush_scope, so attachments registered duringon_crash/before_sendpropagate through the existing scope-flush hook and reach the daemon.Related items: