Adds new metrics for discovery

les/metrics.go

@@ -112,6 +112,8 @@ var (
 
 	requestRTT       = metrics.NewRegisteredTimer("les/client/req/rtt", nil)
 	requestSendDelay = metrics.NewRegisteredTimer("les/client/req/sendDelay", nil)
+
+	clientDiscoveredNodesCounter = metrics.NewRegisteredCounter("les/client/discovered", nil) // Counter for discovered nodes
 )
 
 // meteredMsgReadWriter is a wrapper around a p2p.MsgReadWriter, capable of

les/serverpool.go

@@ -198,6 +198,7 @@ func (pool *serverPool) discoverNodes() {
 		if err != nil {
 			continue
 		}
+		clientDiscoveredNodesCounter.Inc(1)
 		pool.discNodes <- enode.NewV4(pubkey, n.IP, int(n.TCP), int(n.UDP))
 	}
 }

p2p/dial.go

@@ -328,6 +328,7 @@ type discoverTask struct {
 
 func (t *discoverTask) Do(srv *Server) {
 	t.results = enode.ReadNodes(srv.discmix, t.want)
+	discoveredPeersCounter.Inc(int64(len(t.results)))
 }
 
 func (t *discoverTask) String() string {

p2p/discover/metrics.go

@@ -0,0 +1,24 @@
+// Copyright 2018 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package discover
+
+import "github.com/ethereum/go-ethereum/metrics"
+
+var (
+	ingressTrafficMeter = metrics.NewRegisteredMeter("discover/ingress", nil)
+	egressTrafficMeter  = metrics.NewRegisteredMeter("discover/egress", nil)
+)

p2p/discover/v4_udp.go

@@ -670,8 +670,11 @@ func (t *UDPv4) send(toaddr *net.UDPAddr, toid enode.ID, req packetV4) ([]byte,
 }
 
 func (t *UDPv4) write(toaddr *net.UDPAddr, toid enode.ID, what string, packet []byte) error {
-	_, err := t.conn.WriteToUDP(packet, toaddr)
+	nbytes, err := t.conn.WriteToUDP(packet, toaddr)
 	t.log.Trace(">> "+what, "id", toid, "addr", toaddr, "err", err)
+	if err == nil {
+		egressTrafficMeter.Mark(int64(nbytes))
+	}
 	return err
 }
 
@@ -709,6 +712,7 @@ func (t *UDPv4) readLoop(unhandled chan<- ReadPacket) {
 	buf := make([]byte, maxPacketSize)
 	for {
 		nbytes, from, err := t.conn.ReadFromUDP(buf)
+		ingressTrafficMeter.Mark(int64(nbytes))
 		if netutil.IsTemporaryError(err) {
 			// Ignore temporary read errors.
 			t.log.Debug("Temporary UDP read error", "err", err)

p2p/metrics.go

@@ -30,22 +30,23 @@ import (
 )
 
 const (
-	MetricsInboundTraffic   = "p2p/ingress" // Name for the registered inbound traffic meter
-	MetricsOutboundTraffic  = "p2p/egress"  // Name for the registered outbound traffic meter
-	MetricsOutboundConnects = "p2p/dials"   // Name for the registered outbound connects meter
-	MetricsInboundConnects  = "p2p/serves"  // Name for the registered inbound connects meter
+	MetricsInboundTraffic  = "p2p/ingress" // Name for the registered inbound traffic meter
+	MetricsOutboundTraffic = "p2p/egress"  // Name for the registered outbound traffic meter
 
 	MeteredPeerLimit = 1024 // This amount of peers are individually metered
 )
 
 var (
-	ingressConnectMeter       = metrics.NewRegisteredMeter(MetricsInboundConnects, nil)  // Meter counting the ingress connections
-	ingressTrafficMeter       = metrics.NewRegisteredMeter(MetricsInboundTraffic, nil)   // Meter metering the cumulative ingress traffic
-	egressConnectMeter        = metrics.NewRegisteredMeter(MetricsOutboundConnects, nil) // Meter counting the egress connections
-	egressTrafficMeter        = metrics.NewRegisteredMeter(MetricsOutboundTraffic, nil)  // Meter metering the cumulative egress traffic
-	activePeerGauge           = metrics.NewRegisteredGauge("p2p/peers", nil)             // Gauge tracking the current peer count
-	activeValidatorsPeerGauge = metrics.NewRegisteredGauge("p2p/peers/validators", nil)  // Gauge tracking the current validators peer count
-	activeProxiesPeerGauge    = metrics.NewRegisteredGauge("p2p/peers/proxies", nil)     // Gauge tracking the current proxies peer count
+	ingressConnectMeter              = metrics.NewRegisteredMeter("p2p/serves", nil)             // Meter counting the ingress connections
+	ingressConnectWithHandshakeMeter = metrics.NewRegisteredMeter("p2p/serves/handshakes", nil)  // Meter counting the ingress with successful handshake connections
+	ingressTrafficMeter              = metrics.NewRegisteredMeter(MetricsInboundTraffic, nil)    // Meter metering the cumulative ingress traffic
+	egressConnectMeter               = metrics.NewRegisteredMeter("p2p/dials", nil)              // Meter counting the egress connections
+	egressConnectWithHandshakeMeter  = metrics.NewRegisteredMeter("p2p/dials/handshakes", nil)   // Meter counting the egress with successful handshake connections
+	egressTrafficMeter               = metrics.NewRegisteredMeter(MetricsOutboundTraffic, nil)   // Meter metering the cumulative egress traffic
+	activePeerGauge                  = metrics.NewRegisteredGauge("p2p/peers", nil)              // Gauge tracking the current peer count
+	activeValidatorsPeerGauge        = metrics.NewRegisteredGauge("p2p/peers/validators", nil)   // Gauge tracking the current validators peer count
+	activeProxiesPeerGauge           = metrics.NewRegisteredGauge("p2p/peers/proxies", nil)      // Gauge tracking the current proxies peer count
+	discoveredPeersCounter           = metrics.NewRegisteredCounter("p2p/peers/discovered", nil) // Counter of the total discovered peers
 
 	PeerIngressRegistry = metrics.NewPrefixedChildRegistry(metrics.EphemeralRegistry, MetricsInboundTraffic+"/")  // Registry containing the peer ingress
 	PeerEgressRegistry  = metrics.NewPrefixedChildRegistry(metrics.EphemeralRegistry, MetricsOutboundTraffic+"/") // Registry containing the peer egress
@@ -94,6 +95,7 @@ type meteredConn struct {
 	connected time.Time    // Connection time of the peer
 	addr      *net.TCPAddr // TCP address of the peer
 	peer      *Peer        // Peer instance
+	ingress   bool         // Indicates wether connection inbound or outbound
 
 	// trafficMetered denotes if the peer is registered in the traffic registries.
 	// Its value is true if the metered peer count doesn't reach the limit in the
@@ -118,6 +120,7 @@ func newMeteredConn(conn net.Conn, ingress bool, addr *net.TCPAddr) net.Conn {
 		log.Warn("Peer address is unspecified")
 		return conn
 	}
+
 	// Bump the connection counters and wrap the connection
 	if ingress {
 		ingressConnectMeter.Mark(1)
@@ -129,6 +132,7 @@ func newMeteredConn(conn net.Conn, ingress bool, addr *net.TCPAddr) net.Conn {
 	return &meteredConn{
 		Conn:      conn,
 		addr:      addr,
+		ingress:   ingress,
 		connected: time.Now(),
 	}
 }
@@ -161,6 +165,12 @@ func (c *meteredConn) Write(b []byte) (n int, err error) {
 
 // handshakeDone is called after the connection passes the handshake.
 func (c *meteredConn) handshakeDone(peer *Peer) {
+	if c.ingress {
+		ingressConnectWithHandshakeMeter.Mark(1)
+	} else {
+		egressConnectWithHandshakeMeter.Mark(1)
+	}
+
 	if atomic.AddInt32(&meteredPeerCount, 1) >= MeteredPeerLimit {
 		// Don't register the peer in the traffic registries.
 		atomic.AddInt32(&meteredPeerCount, -1)