Replace IllegalStateException with EOFException in readRawVarint32#2687
Merged
jaydeluca merged 2 commits intoopen-telemetry:mainfrom Mar 12, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Replace unchecked IllegalStateException throws in readRawVarint32 with checked EOFException/IOException so callers can gracefully handle truncated or corrupted disk-buffered protobuf data (fixes #2684).
Changes:
- Throw
EOFExceptionwhen the stream ends mid-varint (read()returns-1). - Throw
IOExceptioninstead ofIllegalStateExceptionwhen the varint is malformed/too long.
You can also share your feedback on Copilot code review. Take the survey.
...ring/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/utils/ProtobufTools.java
Outdated
Show resolved
Hide resolved
...ring/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/utils/ProtobufTools.java
Outdated
Show resolved
Hide resolved
...ring/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/utils/ProtobufTools.java
Outdated
Show resolved
Hide resolved
- Replace unchecked IllegalStateException with checked EOFException and IOException - Enables graceful handling of corrupted disk-buffered data Fixes open-telemetry#2684
OxxxyAction
force-pushed
the
improvement/disk-buffering-error-handling
branch
from
b82fabd to
64bce13
Compare
LikeTheSalad
approved these changes
Mar 12, 2026
Contributor
LikeTheSalad
left a comment
LikeTheSalad
left a comment
There was a problem hiding this comment.
Thank you, @OxxxyAction
I agree with Copilot's comments on adding error messages to the exceptions. Other than that, it looks good to me 👍
jaydeluca
approved these changes
Mar 12, 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
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.
Replace unchecked IllegalStateException with checked EOFException and IOException
Enables graceful handling of corrupted disk-buffered data
Fixes #2684
Description:
Replaces unchecked IllegalStateException with checked EOFException to enable graceful error handling for corrupted disk-buffered data.
Existing Issue(s):
#2684