From ac0a0533b7bd67040d6e89f61b082659ad7ee220 Mon Sep 17 00:00:00 2001 From: Asmir Avdicevic Date: Mon, 22 Jul 2024 15:32:02 +0200 Subject: [PATCH] rebase cleanup --- iroh-net/src/magicsock.rs | 4 ++-- iroh-net/src/magicsock/metrics.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/iroh-net/src/magicsock.rs b/iroh-net/src/magicsock.rs index 644fb81b39..1464fdc095 100644 --- a/iroh-net/src/magicsock.rs +++ b/iroh-net/src/magicsock.rs @@ -1815,7 +1815,7 @@ impl Actor { "tick: direct addr heartbeat {} direct addrs", self.msock.node_map.node_count(), ); - inc!(Metrics, actor_tick_endpoint_heartbeat); + inc!(Metrics, actor_tick_direct_addr_heartbeat); // TODO: this might trigger too many packets at once, pace this self.msock.node_map.prune_inactive(); @@ -1825,7 +1825,7 @@ impl Actor { _ = direct_addr_update_receiver.changed() => { let reason = *direct_addr_update_receiver.borrow(); trace!("tick: direct addr update receiver {:?}", reason); - inc!(Metrics, actor_tick_endpoints_update_receiver); + inc!(Metrics, actor_tick_direct_addr_update_receiver); if let Some(reason) = reason { self.update_direct_addrs(reason).await; } diff --git a/iroh-net/src/magicsock/metrics.rs b/iroh-net/src/magicsock/metrics.rs index 972d6f8328..8670119a33 100644 --- a/iroh-net/src/magicsock/metrics.rs +++ b/iroh-net/src/magicsock/metrics.rs @@ -71,8 +71,8 @@ pub struct Metrics { pub actor_tick_msg: Counter, pub actor_tick_re_stun: Counter, pub actor_tick_portmap_changed: Counter, - pub actor_tick_endpoint_heartbeat: Counter, - pub actor_tick_endpoints_update_receiver: Counter, + pub actor_tick_direct_addr_heartbeat: Counter, + pub actor_tick_direct_addr_update_receiver: Counter, pub actor_tick_nodes_timer: Counter, pub actor_link_change: Counter, pub actor_tick_other: Counter, @@ -142,9 +142,9 @@ impl Default for Metrics { actor_tick_msg: Counter::new("actor_tick_msg"), actor_tick_re_stun: Counter::new("actor_tick_re_stun"), actor_tick_portmap_changed: Counter::new("actor_tick_portmap_changed"), - actor_tick_endpoint_heartbeat: Counter::new("actor_tick_endpoint_heartbeat"), - actor_tick_endpoints_update_receiver: Counter::new( - "actor_tick_endpoints_update_receiver", + actor_tick_direct_addr_heartbeat: Counter::new("actor_tick_direct_addr_heartbeat"), + actor_tick_direct_addr_update_receiver: Counter::new( + "actor_tick_direct_addr_update_receiver", ), actor_tick_nodes_timer: Counter::new("actor_tick_nodes_timer"), actor_link_change: Counter::new("actor_link_change"),