From 7677ec1f3414c1e3712bf33598f8780c3b76742b Mon Sep 17 00:00:00 2001 From: Dmitry Shulyak Date: Tue, 29 May 2018 14:46:09 +0300 Subject: [PATCH] p2p/discv5: add egress/ingress traffic metrics to discv5 udp transport (#16369) --- p2p/discv5/metrics.go | 8 ++++++++ p2p/discv5/udp.go | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 p2p/discv5/metrics.go diff --git a/p2p/discv5/metrics.go b/p2p/discv5/metrics.go new file mode 100644 index 000000000..cb11d7eac --- /dev/null +++ b/p2p/discv5/metrics.go @@ -0,0 +1,8 @@ +package discv5 + +import "github.com/ethereum/go-ethereum/metrics" + +var ( + ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil) + egressTrafficMeter = metrics.NewRegisteredMeter("discv5/OutboundTraffic", nil) +) diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 09e5f8b37..49e1cb811 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -334,8 +334,10 @@ func (t *udp) sendPacket(toid NodeID, toaddr *net.UDPAddr, ptype byte, req inter return hash, err } log.Trace(fmt.Sprintf(">>> %v to %x@%v", nodeEvent(ptype), toid[:8], toaddr)) - if _, err = t.conn.WriteToUDP(packet, toaddr); err != nil { + if nbytes, err := t.conn.WriteToUDP(packet, toaddr); err != nil { log.Trace(fmt.Sprint("UDP send failed:", err)) + } else { + egressTrafficMeter.Mark(int64(nbytes)) } //fmt.Println(err) return hash, err @@ -374,6 +376,7 @@ func (t *udp) readLoop() { buf := make([]byte, 1280) for { nbytes, from, err := t.conn.ReadFromUDP(buf) + ingressTrafficMeter.Mark(int64(nbytes)) if netutil.IsTemporaryError(err) { // Ignore temporary read errors. log.Debug(fmt.Sprintf("Temporary read error: %v", err))