cr feedback

internal/p2p/metrics.go

@@ -28,7 +28,7 @@ var (
 // Metrics contains metrics exposed by this package.
 type Metrics struct {
 	// Number of peers connected.
-	PeersConnected metrics.Gauge
+	Peers metrics.Gauge
 	// Nomber of peers in the peer store database.
 	PeersStored metrics.Gauge
 	// Number of inactive peers stored.
@@ -48,10 +48,10 @@ type Metrics struct {
 
 	// Number of peers connected as a result of dialing the
 	// peer.
-	PeersConnectedIncoming metrics.Gauge
+	PeersConnectedOutgoing metrics.Gauge
 	// Number of peers connected as a result of the peer dialing
 	// this node.
-	PeersConnectedOutgoing metrics.Gauge
+	PeersConnectedIncoming metrics.Gauge
 
 	// RouterPeerQueueRecv defines the time taken to read off of a peer's queue
 	// before sending on the connection.
@@ -86,7 +86,7 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
 		labels = append(labels, labelsAndValues[i])
 	}
 	return &Metrics{
-		PeersConnected: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+		Peers: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
 			Namespace: namespace,
 			Subsystem: MetricsSubsystem,
 			Name:      "peers",
@@ -108,13 +108,13 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
 			Namespace: namespace,
 			Subsystem: MetricsSubsystem,
 			Name:      "peers_connected_success",
-			Help:      "Number of peers connected to successfully",
+			Help:      "Number of successful peer connection attempts",
 		}, labels).With(labelsAndValues...),
 		PeersConnectedFailure: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
 			Namespace: namespace,
 			Subsystem: MetricsSubsystem,
 			Name:      "peers_connected_failure",
-			Help:      "Number of peers connected to successfully",
+			Help:      "Number of unsuccessful peer connection attempts",
 		}, labels).With(labelsAndValues...),
 		PeersConnectedIncoming: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
 			Namespace: namespace,
@@ -193,7 +193,7 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
 // NopMetrics returns no-op Metrics.
 func NopMetrics() *Metrics {
 	return &Metrics{
-		PeersConnected:         discard.NewGauge(),
+		Peers:                  discard.NewGauge(),
 		PeersStored:            discard.NewGauge(),
 		PeersConnectedSuccess:  discard.NewCounter(),
 		PeersConnectedFailure:  discard.NewCounter(),

internal/p2p/router.go

@@ -555,8 +555,8 @@ func (r *Router) filterPeersID(ctx context.Context, id types.NodeID) error {
 func (r *Router) dialSleep(ctx context.Context) {
 	if r.options.DialSleep == nil {
 		const (
-			maxDialerInterval = 3000
-			minDialerInterval = 250
+			maxDialerInterval = 500
+			minDialerInterval = 100
 		)
 
 		// nolint:gosec // G404: Use of weak random number generator
@@ -876,7 +876,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.PeersConnected.Add(1)
+	r.metrics.Peers.Add(1)
 	r.peerManager.Ready(peerID, channels)
 
 	sendQueue := r.getOrMakeQueue(peerID, channels)
@@ -889,7 +889,7 @@ func (r *Router) routePeer(peerID types.NodeID, conn Connection, channels Channe
 		sendQueue.close()
 
 		r.peerManager.Disconnected(peerID)
-		r.metrics.PeersConnected.Add(-1)
+		r.metrics.Peers.Add(-1)
 	}()
 
 	r.logger.Info("peer connected", "peer", peerID, "endpoint", conn)

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.PeersConnected.Add(float64(-1))
+		sw.metrics.Peers.Add(-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.PeersConnected.Add(float64(1))
+	sw.metrics.Peers.Add(1)
 
 	// Start all the reactor protocols on the peer.
 	for _, reactor := range sw.reactors {