Skip to content

p2p: fix dial metrics not picking up the right error #31621

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

Merged
merged 10 commits into from
Apr 15, 2025
Merged

p2p: fix dial metrics not picking up the right error #31621

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f5e0ead
fix dial metrics not picking up the right error
cskiraly Apr 12, 2025
f202047
p2p: wrap internal error in new error type
cskiraly Apr 14, 2025
6635c0f
Update server.go
fjl Apr 14, 2025
3596026
Update metrics.go
fjl Apr 14, 2025
fd020d9
Update server.go
fjl Apr 14, 2025
7e1e26c
p2p: add catchall dialOtherError meter
cskiraly Apr 14, 2025
b7626f0
p2p: list underlying errors for some meters
cskiraly Apr 15, 2025
f724db5
fixing TestServerSetupConn
cskiraly Apr 15, 2025
071d9a4
better comments
cskiraly Apr 15, 2025
d2fce76
p2p: update
fjl Apr 15, 2025
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
21 changes: 10 additions & 11 deletions p2p/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,22 @@ func markDialError(err error) {
if !metrics.Enabled() {
return
}
if err2 := errors.Unwrap(err); err2 != nil {
Copy link
Contributor

@fjl fjl Apr 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think what we really want here is

var reason DiscReason
if errors.As(err, &reason) {
    switch reason {
    ...
    }
}
var phe *protoHandshakeError
if errors.As(err, &phe) {
    dialProtoHandshakeError.Mark(1)
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds reasonable, and also cleaner. I will verify how it works, and come back with a patch.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dialProtoHandshakeError would have to be in an else branch, and we would still need to handle dialEncHandshakeError separately.
I would say the original with Is and As is better. I've added a catch-all and some comments to make it even cleaner.

err = err2
}
switch err {
case DiscTooManyPeers:

var phe *protoHandshakeError
switch {
case errors.Is(err, DiscTooManyPeers):
dialTooManyPeers.Mark(1)
case DiscAlreadyConnected:
case errors.Is(err, DiscAlreadyConnected):
dialAlreadyConnected.Mark(1)
case DiscSelf:
case errors.Is(err, DiscSelf):
dialSelf.Mark(1)
case DiscUselessPeer:
case errors.Is(err, DiscUselessPeer):
dialUselessPeer.Mark(1)
case DiscUnexpectedIdentity:
case errors.Is(err, DiscUnexpectedIdentity):
dialUnexpectedIdentity.Mark(1)
case errEncHandshakeError:
case errors.Is(err, errEncHandshakeError):
dialEncHandshakeError.Mark(1)
case errProtoHandshakeError:
case errors.As(err, &phe):
dialProtoHandshakeError.Mark(1)
}
}
Expand Down
12 changes: 8 additions & 4 deletions p2p/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,15 @@ const (
)

var (
errServerStopped = errors.New("server stopped")
errEncHandshakeError = errors.New("rlpx enc error")
errProtoHandshakeError = errors.New("rlpx proto error")
errServerStopped = errors.New("server stopped")
errEncHandshakeError = errors.New("rlpx enc error")
)

type protoHandshakeError struct{ err error }

func (e *protoHandshakeError) Error() string { return fmt.Sprintf("rlpx proto error: %v", e.err) }
func (e *protoHandshakeError) Unwrap() error { return e.err }

// Server manages all peer connections.
type Server struct {
// Config fields may not be modified while the server is running.
Expand Down Expand Up @@ -907,7 +911,7 @@ func (srv *Server) setupConn(c *conn, dialDest *enode.Node) error {
phs, err := c.doProtoHandshake(srv.ourHandshake)
if err != nil {
clog.Trace("Failed p2p handshake", "err", err)
return fmt.Errorf("%w: %v", errProtoHandshakeError, err)
return &protoHandshakeError{err: err}
}
if id := c.node.ID(); !bytes.Equal(crypto.Keccak256(phs.ID), id[:]) {
clog.Trace("Wrong devp2p handshake identity", "phsid", hex.EncodeToString(phs.ID))
Expand Down
Loading