fix(clientreport): Stop deserializing discarded logs (JAVA-662) - #5835
Open
runningcode wants to merge 3 commits into
Open
fix(clientreport): Stop deserializing discarded logs (JAVA-662)#5835runningcode wants to merge 3 commits into
runningcode wants to merge 3 commits into
Conversation
📲 Install BuildsAndroid
|
Contributor
Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 6b019b7 | 319.84 ms | 333.15 ms | 13.31 ms |
| c3ee041 | 310.64 ms | 361.90 ms | 51.26 ms |
| d501a7e | 348.06 ms | 431.42 ms | 83.36 ms |
| 3998a95 | 415.94 ms | 478.54 ms | 62.60 ms |
| ed33deb | 343.30 ms | 362.41 ms | 19.10 ms |
| 5b1a06b | 310.56 ms | 362.79 ms | 52.22 ms |
| 91bb874 | 310.68 ms | 359.24 ms | 48.56 ms |
| 0ee65e9 | 317.37 ms | 366.50 ms | 49.13 ms |
| 6edfca2 | 305.52 ms | 432.78 ms | 127.26 ms |
| 5e269de | 292.83 ms | 379.12 ms | 86.29 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 6b019b7 | 0 B | 0 B | 0 B |
| c3ee041 | 0 B | 0 B | 0 B |
| d501a7e | 0 B | 0 B | 0 B |
| 3998a95 | 1.58 MiB | 2.10 MiB | 532.96 KiB |
| ed33deb | 1.58 MiB | 2.13 MiB | 559.52 KiB |
| 5b1a06b | 0 B | 0 B | 0 B |
| 91bb874 | 1.58 MiB | 2.13 MiB | 559.07 KiB |
| 0ee65e9 | 0 B | 0 B | 0 B |
| 6edfca2 | 1.58 MiB | 2.13 MiB | 559.07 KiB |
| 5e269de | 0 B | 0 B | 0 B |
runningcode
force-pushed
the
no/java-662-cpu-busy-loop
branch
from
July 29, 2026 14:47
d69d8d4 to
bd9a1d8
Compare
ClientReportRecorder counted discarded log and metric items by fully deserializing the envelope payload just to read its size. On the discard path this runs continuously under sustained rate limiting, and the JSON reader's error-tolerant recovery throws an exception per token, pinning CPU cores in a busy-loop (fillInStackTrace dominated the profile). The item count is already stored in the envelope item header, so read it from there instead of deserializing. Byte counts still come from the raw data. This makes the discard path O(1) and allocation/exception-free. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
The two tests asserting that restoring counts from an attached client report does not re-fire onDiscard were named for their setup rather than for what actually differed between them, which made the pair read as an accidental duplicate. Name each for its entry point and share the setup and verifications, so it is clear the property is being pinned for both recordLostEnvelope and recordLostEnvelopeItem. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
runningcode
force-pushed
the
no/java-662-cpu-busy-loop
branch
from
July 29, 2026 14:57
bd9a1d8 to
8554314
Compare
runningcode
marked this pull request as ready for review
July 29, 2026 14:59
runningcode
requested review from
0xadam-brown,
adinauer,
markushi and
romtsn
as code owners
July 29, 2026 14:59
runningcode
added
the
sanity-check
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
TL;DR we can skip deserializing the envelope payload just to read
getItems().size()by adding a newSentryEnvelopeItemHeader.getItemCount()and using it. The serialization was reported by a customer(JAVA-662) to cause a busy CPU loop.Full version:
ClientReportRecorder.recordLostEnvelopeItemcounted discarded log and metric items by fully deserializing the envelope payload just to readgetItems().size(). The item count is already carried in the envelope item header, so this change reads it from the header instead of deserializing. Byte counts still come from the rawgetData()bytes.SentryEnvelopeItemHeader.getItemCount().recordLostEnvelopeItemnow use the header count; when it is absent (legacy/foreign envelopes) they fall back to1and never deserialize.💡 Motivation and Context
This was reported by a customer to cause a busy CPU loop and this is a quick and safe optimization.
Fixes GH-5830
Fixes JAVA-662
💚 How did you test it?
Unit tests in
ClientReportTest📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
None.