Skip to content
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

Jump to bottom

p2p: add serve metrics #2114

Merged
merged 1 commit into from
Jan 8, 2024
Merged

p2p: add serve metrics #2114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 37 additions & 1 deletion p2p/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,23 @@ var (
dialSuccessMeter metrics.Meter = metrics.NilMeter{}
dialConnectionError metrics.Meter = metrics.NilMeter{}

// handshake error meters
// dial error meters
dialTooManyPeers = metrics.NewRegisteredMeter("p2p/dials/error/saturated", nil)
dialAlreadyConnected = metrics.NewRegisteredMeter("p2p/dials/error/known", nil)
dialSelf = metrics.NewRegisteredMeter("p2p/dials/error/self", nil)
dialUselessPeer = metrics.NewRegisteredMeter("p2p/dials/error/useless", nil)
dialUnexpectedIdentity = metrics.NewRegisteredMeter("p2p/dials/error/id/unexpected", nil)
dialEncHandshakeError = metrics.NewRegisteredMeter("p2p/dials/error/rlpx/enc", nil)
dialProtoHandshakeError = metrics.NewRegisteredMeter("p2p/dials/error/rlpx/proto", nil)

// serve error meters
serveTooManyPeers = metrics.NewRegisteredMeter("p2p/serves/error/saturated", nil)
serveAlreadyConnected = metrics.NewRegisteredMeter("p2p/serves/error/known", nil)
serveSelf = metrics.NewRegisteredMeter("p2p/serves/error/self", nil)
serveUselessPeer = metrics.NewRegisteredMeter("p2p/serves/error/useless", nil)
serveUnexpectedIdentity = metrics.NewRegisteredMeter("p2p/serves/error/id/unexpected", nil)
serveEncHandshakeError = metrics.NewRegisteredMeter("p2p/serves/error/rlpx/enc", nil)
serveProtoHandshakeError = metrics.NewRegisteredMeter("p2p/serves/error/rlpx/proto", nil)
)

func init() {
Expand Down Expand Up @@ -99,6 +108,33 @@ func markDialError(err error) {
}
}

// markServeError matches errors that occur while setting up a serve connection
// to the corresponding meter.
func markServeError(err error) {
if !metrics.Enabled {
return
}
if err2 := errors.Unwrap(err); err2 != nil {
err = err2
}
switch err {
case DiscTooManyPeers:
serveTooManyPeers.Mark(1)
case DiscAlreadyConnected:
serveAlreadyConnected.Mark(1)
case DiscSelf:
serveSelf.Mark(1)
case DiscUselessPeer:
serveUselessPeer.Mark(1)
case DiscUnexpectedIdentity:
serveUnexpectedIdentity.Mark(1)
case errEncHandshakeError:
serveEncHandshakeError.Mark(1)
case errProtoHandshakeError:
serveProtoHandshakeError.Mark(1)
}
}

// meteredConn is a wrapper around a net.Conn that meters both the
// inbound and outbound network traffic.
type meteredConn struct {
Expand Down
2 changes: 2 additions & 0 deletions p2p/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,8 @@ func (srv *Server) SetupConn(fd net.Conn, flags connFlag, dialDest *enode.Node)
if err != nil {
if !c.is(inboundConn) {
markDialError(err)
} else {
markServeError(err)
}
c.close(err)
}
Expand Down