fix(android): mark tombstone and ANR exits as reported when the event is dropped - #6002
Merged
Merged
Conversation
… is dropped Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
📲 Install BuildsAndroid
|
markushi
marked this pull request as ready for review
August 26, 2026 10:01
markushi
requested review from
0xadam-brown,
adinauer,
romtsn and
runningcode
as code owners
August 26, 2026 10:01
0xadam-brown
left a comment
0xadam-brown
left a comment
Member
There was a problem hiding this comment.
Nice to fix this 👍
Lgtm save for the ambiguity of the EMPTY_ID, as called out by SentryBot here.
…ropped events Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
…d on purpose Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
![sentry[bot]](https://avatars.githubusercontent.com/in/12637?s=60&v=4){kind=small}
…exits-as-reported # Conflicts: # CHANGELOG.md
An exit was only marked as reported when the hint carried one of a handful of drop reasons, so every drop path that forgot to set one - event processors, applyScope, event size limiting - reported the same exit again at every app start. Turn the check around: the hint is now flagged only when handing the event over failed, and any drop, whatever its cause, marks the exit as reported.
0xadam-brown
approved these changes
Aug 27, 2026
This was referenced Sep 2, 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
2 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.
📜 Description
The last reported marker (
last_tombstone_report/last_anr_report) was only written as a sideeffect of caching the envelope on disk. An event dropped by
beforeSendnever gets there, so thesame
ApplicationExitInfowas turned into an event again at every app start.ApplicationExitInfoHistoryDispatchernow writes the marker as well whencaptureEventreturnsSentryId.EMPTY_ID, through a newApplicationExitInfoPolicy.markReported(long). The successfulpath is unchanged.
💡 Motivation and Context
A discarded crash must stay discarded. This is how signal handler events already behave, because
OutboxSenderdeletes the outbox file independent of the result ofbeforeSend.Tombstoneevents discarded frombeforeSendare re-reported on every app launch #5973💚 How did you test it?
New test in
ApplicationExitIntegrationTestBase, so it runs for bothTombstoneIntegrationTestand
AnrV2IntegrationTest. It failed before the change and passes now. Full:sentry-android-core:testReleaseUnitTestis green.📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
TombstonePolicydeletes the matching native outbox file before the capture, so native data cannotcome back if the merged event is lost. That is a separate defect.