feat(swarm): expose ConnectionId and add conn duration metric

- Exposes the `ConnectionId` in the various `SwarmEvent` variants. - Tracks connection duration in `libp2p-metrics::swarm`. Pull-Request: libp2p#3927.
umgefahren · May 17, 2023 · 3cbaef0 · 3cbaef0
1 parent 316e85e
commit 3cbaef0
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/tests/test_server.rs b/tests/test_server.rs
@@ -96,14 +96,18 @@ async fn test_dial_back() {
                 num_established,
                 concurrent_dial_errors,
                 established_in: _,
+                connection_id: _,
             } => {
                 assert_eq!(peer_id, client_id);
                 assert_eq!(num_established, NonZeroU32::new(2).unwrap());
                 assert!(concurrent_dial_errors.unwrap().is_empty());
                 assert_eq!(address, expect_addr);
                 break;
             }
-            SwarmEvent::Dialing(peer) => assert_eq!(peer, client_id),
+            SwarmEvent::Dialing {
+                peer_id: Some(peer),
+                ..
+            } => assert_eq!(peer, client_id),
             SwarmEvent::NewListenAddr { .. } | SwarmEvent::ExpiredListenAddr { .. } => {}
             other => panic!("Unexpected swarm event: {other:?}."),
         }
@@ -143,12 +147,15 @@ async fn test_dial_error() {
 
     loop {
         match server.next_swarm_event().await {
-            SwarmEvent::OutgoingConnectionError { peer_id, error } => {
+            SwarmEvent::OutgoingConnectionError { peer_id, error, .. } => {
                 assert_eq!(peer_id.unwrap(), client_id);
                 assert!(matches!(error, DialError::Transport(_)));
                 break;
             }
-            SwarmEvent::Dialing(peer) => assert_eq!(peer, client_id),
+            SwarmEvent::Dialing {
+                peer_id: Some(peer),
+                ..
+            } => assert_eq!(peer, client_id),
             SwarmEvent::NewListenAddr { .. } | SwarmEvent::ExpiredListenAddr { .. } => {}
             other => panic!("Unexpected swarm event: {other:?}."),
         }
@@ -307,7 +314,10 @@ async fn test_dial_multiple_addr() {
                 assert_eq!(address, dial_addresses[1]);
                 break;
             }
-            SwarmEvent::Dialing(peer) => assert_eq!(peer, client_id),
+            SwarmEvent::Dialing {
+                peer_id: Some(peer),
+                ..
+            } => assert_eq!(peer, client_id),
             SwarmEvent::NewListenAddr { .. } | SwarmEvent::ExpiredListenAddr { .. } => {}
             other => panic!("Unexpected swarm event: {other:?}."),
         }