Skip to content

fix(sentry): Recover object readers after deserialization errors #5293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adinauer wants to merge 19 commits into
base: main
Choose a base branch
from
Open

fix(sentry): Recover object readers after deserialization errors #5293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5ab0155
fix(sentry): Prevent object readers from hanging on bad values
adinauer Apr 14, 2026
1f8edab
fix(sentry): Guard JsonObjectReader recovery failures
adinauer Apr 14, 2026
f823221
ref(sentry): Extract JsonObjectReader recovery helper
adinauer Apr 14, 2026
55321ec
fix(sentry): Unwind MapObjectReader failures fully
adinauer Apr 14, 2026
98fb625
changelog
adinauer Apr 14, 2026
d6f8299
fix(sentry): Track container entry during JSON recovery
adinauer Apr 15, 2026
cc962a6
fix(sentry): Track consumed values during JSON recovery
adinauer Apr 15, 2026
50e4f46
fix(sentry): Log unknown key recovery failures
adinauer Apr 15, 2026
298720a
docs(changelog): Clarify JSON recovery log levels
adinauer Apr 15, 2026
d710cca
merge changelog lines
adinauer Apr 15, 2026
356ddda
mark consumed afterwards instead of before
adinauer Apr 16, 2026
558453c
Merge branch 'main' into fix/jsonobjectreader-hanging
adinauer Apr 16, 2026
8f20021
test(sentry): Remove explicit timeouts from reader recovery tests
adinauer Apr 16, 2026
886612d
test(sentry): Rename mismatched MapObjectReader recovery tests
adinauer Apr 16, 2026
1bcb316
fix(sentry): Mark skipped values consumed after success
adinauer Apr 16, 2026
27f2d21
fix(sentry): Handle empty collections in MapObjectReader
adinauer Apr 16, 2026
37e9595
fix(sentry): Preserve list recovery in MapObjectReader
adinauer Apr 16, 2026
c9d3909
Merge branch 'main' into fix/jsonobjectreader-hanging
adinauer Apr 16, 2026
0f38c5f
fix(sentry): Continue list recovery until array end
adinauer Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

### Fixes

- Fix `JsonObjectReader` and `MapObjectReader` hanging indefinitely when deserialization errors leave the reader in an inconsistent state ([#5293](https://github.com/getsentry/sentry-java/pull/5293))
- Failed collection values are now skipped so parsing can continue
- Skipped collection values emit `WARNING` logs
- Unknown-key failures and unrecoverable recovery failures emit `ERROR` logs
- Fix ANR caused by `GestureDetectorCompat` Handler/MessageQueue lock contention in `SentryWindowCallback` ([#5138](https://github.com/getsentry/sentry-java/pull/5138))

### Internal
Expand Down
Loading
Loading