gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core, metrics, p2p: switch some invalid counters to gauges

Browse Source
This commit is contained in:
Péter Szilágyi
2019-09-10 14:39:07 +03:00
parent 4f6bf2f1c5
commit 72d5a27a39
6 changed files with 108 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
p2p/metrics.go
View File

@ -45,7 +45,7 @@ var (
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
activePeerCounter = metrics.NewRegisteredCounter("p2p/peers", nil) // Gauge tracking the current peer count
activePeerGauge = metrics.NewRegisteredGauge("p2p/peers", nil) // Gauge tracking the current peer count
PeerIngressRegistry = metrics.NewPrefixedChildRegistry(metrics.EphemeralRegistry, MetricsInboundTraffic+"/") // Registry containing the peer ingress
PeerEgressRegistry = metrics.NewPrefixedChildRegistry(metrics.EphemeralRegistry, MetricsOutboundTraffic+"/") // Registry containing the peer egress
@ -124,7 +124,7 @@ func newMeteredConn(conn net.Conn, ingress bool, ip net.IP) net.Conn {
} else {
egressConnectMeter.Mark(1)
}
activePeerCounter.Inc(1)
activePeerGauge.Inc(1)
return &meteredConn{
Conn: conn,
@ -200,7 +200,7 @@ func (c *meteredConn) Close() error {
IP: c.ip,
Elapsed: time.Since(c.connected),
})
activePeerCounter.Dec(1)
activePeerGauge.Dec(1)
return err
}
id := c.id
@ -212,7 +212,7 @@ func (c *meteredConn) Close() error {
IP: c.ip,
ID: id,
})
activePeerCounter.Dec(1)
activePeerGauge.Dec(1)
return err
}
ingress, egress := uint64(c.ingressMeter.Count()), uint64(c.egressMeter.Count())
@ -233,6 +233,6 @@ func (c *meteredConn) Close() error {
Ingress: ingress,
Egress: egress,
})
activePeerCounter.Dec(1)
activePeerGauge.Dec(1)
return err
}