beacon node: move connected peer metrics,

put them before the ban status checks to avoid negative counts as each FromSwarm::ConnectionClosed event is always paired with an earlier FromSwarm::ConnectionEstablished, and when we ban before incrementing metrics we return earlier.
sigp · Sep 13, 2023 · 85b2df5 · 85b2df5
1 parent a4faad5
commit 85b2df5
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/beacon_node/lighthouse_network/src/peer_manager/network_behaviour.rs b/beacon_node/lighthouse_network/src/peer_manager/network_behaviour.rs
@@ -213,6 +213,30 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
             metrics::check_nat();
         }
 
+        // increment prometheus metrics
+        if self.metrics_enabled {
+            match remote_addr.iter().find(|proto| {
+                matches!(
+                    proto,
+                    multiaddr::Protocol::QuicV1 | multiaddr::Protocol::Tcp(_)
+                )
+            }) {
+                Some(multiaddr::Protocol::QuicV1) => {
+                    metrics::inc_gauge(&metrics::QUIC_PEERS_CONNECTED);
+                }
+                Some(multiaddr::Protocol::Tcp(_)) => {
+                    metrics::inc_gauge(&metrics::TCP_PEERS_CONNECTED);
+                }
+                Some(_) => unreachable!(),
+                None => {
+                    error!(self.log, "Connection established via unknown transport"; "addr" => %remote_addr)
+                }
+            };
+
+            self.update_connected_peer_metrics();
+            metrics::inc_counter(&metrics::PEER_CONNECT_EVENT_COUNT);
+        }
+
         // Check to make sure the peer is not supposed to be banned
         match self.ban_status(&peer_id) {
             // TODO: directly emit the ban event?
@@ -267,28 +291,6 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
                 address
             }
         };
-
-        // increment prometheus metrics
-        if self.metrics_enabled {
-            match remote_addr.iter().find(|proto| {
-                matches!(
-                    proto,
-                    multiaddr::Protocol::QuicV1 | multiaddr::Protocol::Tcp(_)
-                )
-            }) {
-                Some(multiaddr::Protocol::QuicV1) => {
-                    metrics::inc_gauge(&metrics::QUIC_PEERS_CONNECTED);
-                }
-                Some(multiaddr::Protocol::Tcp(_)) => {
-                    metrics::inc_gauge(&metrics::TCP_PEERS_CONNECTED);
-                }
-                Some(_) => unreachable!(),
-                None => error!(self.log, "Connected via unknown transport"; "addr" => %remote_addr),
-            };
-
-            self.update_connected_peer_metrics();
-            metrics::inc_counter(&metrics::PEER_CONNECT_EVENT_COUNT);
-        }
     }
 
     fn on_connection_closed(