diff --git a/internal/p2p/metrics.go b/internal/p2p/metrics.go index 3643e9acc..b2bf12691 100644 --- a/internal/p2p/metrics.go +++ b/internal/p2p/metrics.go @@ -28,8 +28,11 @@ var ( // Metrics contains metrics exposed by this package. type Metrics struct { // Number of peers connected. - Peers metrics.Gauge - PeersStored metrics.Gauge + PeersConnected metrics.Gauge + + // Nomber of peers in the peer store database. + PeersStored metrics.Gauge + // Number of inactive peers stored. PeersInactivated metrics.Gauge // Number of bytes received from a given peer. @@ -72,11 +75,11 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics { labels = append(labels, labelsAndValues[i]) } return &Metrics{ - Peers: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{ + PeersConnected: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{ Namespace: namespace, Subsystem: MetricsSubsystem, Name: "peers", - Help: "Number of peers.", + Help: "Number of peers connected.", }, labels).With(labelsAndValues...), PeersStored: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{ Namespace: namespace, @@ -154,7 +157,7 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics { // NopMetrics returns no-op Metrics. func NopMetrics() *Metrics { return &Metrics{ - Peers: discard.NewGauge(), + PeersConnected: discard.NewGauge(), PeersStored: discard.NewGauge(), PeersInactivated: discard.NewGauge(), PeerReceiveBytesTotal: discard.NewCounter(), diff --git a/internal/p2p/router.go b/internal/p2p/router.go index 0f1a20d7f..fadb7b3aa 100644 --- a/internal/p2p/router.go +++ b/internal/p2p/router.go @@ -869,7 +869,7 @@ func (r *Router) runWithPeerMutex(fn func() error) error { // channels. It will close the given connection and send queue when done, or if // they are closed elsewhere it will cause this method to shut down and return. func (r *Router) routePeer(peerID types.NodeID, conn Connection, channels ChannelIDSet) { - r.metrics.Peers.Add(1) + r.metrics.PeersConnected.Add(1) r.peerManager.Ready(peerID, channels) sendQueue := r.getOrMakeQueue(peerID, channels) @@ -882,7 +882,7 @@ func (r *Router) routePeer(peerID types.NodeID, conn Connection, channels Channe sendQueue.close() r.peerManager.Disconnected(peerID) - r.metrics.Peers.Add(-1) + r.metrics.PeersConnected.Add(-1) }() r.logger.Info("peer connected", "peer", peerID, "endpoint", conn) diff --git a/internal/p2p/switch.go b/internal/p2p/switch.go index ea1272354..4d4cb9e91 100644 --- a/internal/p2p/switch.go +++ b/internal/p2p/switch.go @@ -417,7 +417,7 @@ func (sw *Switch) stopAndRemovePeer(peer Peer, reason interface{}) { // RemovePeer is finished. // https://github.com/tendermint/tendermint/issues/3338 if sw.peers.Remove(peer) { - sw.metrics.Peers.Add(float64(-1)) + sw.metrics.PeersConnected.Add(float64(-1)) } sw.conns.RemoveAddr(peer.RemoteAddr()) @@ -1035,7 +1035,7 @@ func (sw *Switch) addPeer(p Peer) error { if err := sw.peers.Add(p); err != nil { return err } - sw.metrics.Peers.Add(float64(1)) + sw.metrics.PeersConnected.Add(float64(1)) // Start all the reactor protocols on the peer. for _, reactor := range sw.reactors {