eth/protocols/eth: fix handshake timeout metrics classification#33539
Merged
lightclient merged 2 commits intoethereum:masterfrom Feb 25, 2026
Merged
eth/protocols/eth: fix handshake timeout metrics classification#33539lightclient merged 2 commits intoethereum:masterfrom
lightclient merged 2 commits intoethereum:masterfrom
Conversation
Mehdikhademi1367
approved these changes
Jan 6, 2026
MariusVanDerWijden
previously approved these changes
Jan 7, 2026
Member
MariusVanDerWijden
left a comment
MariusVanDerWijden
left a comment
There was a problem hiding this comment.
LGTM, its very weird that unwrap behaves in this way
lightclient
approved these changes
Feb 24, 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
4 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.
Previously, handshake timeouts were recorded as generic peer errors instead of timeout errors. waitForHandshake passed a raw p2p.DiscReadTimeout into markError, but markError classified errors only via errors.Unwrap(err), which returns nil for non-wrapped errors. As a result, the timeoutError meter was never incremented and all such failures fell into the peerError bucket.
This change makes markError switch on the base error, using errors.Unwrap(err) when available and falling back to the original error otherwise. With this adjustment, p2p.DiscReadTimeout is correctly mapped to timeoutError, while existing behaviour for the other wrapped sentinel errors remains unchanged