fix(metric): network broadcast all data size (#452)

nervosnetwork · Sep 10, 2020 · 5a8999a · 5a8999a
1 parent 31d66ab
commit 5a8999a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/core/network/src/peer_manager/shared.rs b/core/network/src/peer_manager/shared.rs
@@ -122,6 +122,10 @@ impl SharedSessionBook for SharedSessions {
             .collect()
         })
     }
+
+    fn len(&self) -> usize {
+        self.sessions().len()
+    }
 }
 
 #[cfg(test)]

diff --git a/core/network/src/protocols/transmitter/behaviour.rs b/core/network/src/protocols/transmitter/behaviour.rs
@@ -191,10 +191,7 @@ impl<'a> SendingContext<'a> {
         let data_size = match &target {
             TargetSession::Single(_) => data.len(),
             TargetSession::Multi(sessions) => data.len().saturating_mul(sessions.len()),
-            _ => {
-                log::warn!("filter blocked return target other than single and multi");
-                data.len()
-            }
+            TargetSession::All => data.len().saturating_mul(self.sessions.len()),
         };
         common_apm::metrics::network::NETWORK_MESSAGE_SIZE_COUNT_VEC
             .with_label_values(&["send", url])

diff --git a/core/network/src/traits.rs b/core/network/src/traits.rs
@@ -50,6 +50,7 @@ pub trait SharedSessionBook {
     fn connected_addr(&self, sid: SessionId) -> Option<ConnectedAddr>;
     fn pending_data_size(&self, sid: SessionId) -> usize;
     fn allowlist(&self) -> Vec<PeerId>;
+    fn len(&self) -> usize;
 }
 
 pub trait MultiaddrExt {