bump deps and refactor with the defaults macro

Author: Arqu

Cargo.lock

@@ -40,6 +40,3 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)", "cfg(iroh_l
 
 [workspace.lints.clippy]
 unused-async = "warn"
-
-[patch.crates-io]
-iroh-metrics = { git = "https://github.com/n0-computer/iroh-metrics", branch = "arqu/histograms" }

Cargo.toml

@@ -32,7 +32,7 @@ http-body-util = "0.1.0"
 hyper = { version = "1", features = ["server", "client", "http1"] }
 hyper-util = "0.1.1"
 iroh-base = { version = "0.92.0", path = "../iroh-base", default-features = false, features = ["key", "relay"] }
-iroh-metrics = { git = "https://github.com/n0-computer/iroh-metrics", branch = "arqu/histograms", default-features = false }
+iroh-metrics = { version = "0.36", default-features = false }
 n0-future = "0.1.2"
 num_enum = "0.7"
 pin-project = "1"

iroh-relay/Cargo.toml

@@ -82,7 +82,7 @@ futures-buffered = "0.2.11"
 pkcs8 = "0.11.0-rc.7"
 
 # metrics
-iroh-metrics = { git = "https://github.com/n0-computer/iroh-metrics", branch = "arqu/histograms", default-features = false }
+iroh-metrics = { version = "0.36", default-features = false }
 
 # local-swarm-discovery
 swarm-discovery = { version = "0.4", optional = true }
@@ -104,7 +104,7 @@ parse-size = { version = "=1.0.0", optional = true, features = ['std'] } # pinne
 hickory-resolver = "0.25.1"
 igd-next = { version = "0.16", features = ["aio_tokio"] }
 netdev = { version = "0.36.0" }
-portmapper = { version = "0.9", default-features = false }
+portmapper = { version = "0.10", default-features = false }
 quinn = { package = "iroh-quinn", version = "0.14.0", default-features = false, features = ["runtime-tokio", "rustls-ring"] }
 tokio = { version = "1", features = [
     "io-util",

iroh/Cargo.toml

@@ -9,7 +9,7 @@ publish = false
 bytes = "1.7"
 hdrhistogram = { version = "7.2", default-features = false }
 iroh = { path = ".." }
-iroh-metrics = "0.35"
+iroh-metrics = "0.36"
 n0-future = "0.1.1"
 n0-snafu = "0.2.0"
 quinn = { package = "iroh-quinn", version = "0.14" }

iroh/bench/Cargo.toml

@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 #[allow(missing_docs)]
 #[derive(Debug, Serialize, Deserialize, MetricsGroup)]
 #[non_exhaustive]
-#[metrics(name = "magicsock")]
+#[metrics(name = "magicsock", default)]
 pub struct Metrics {
     pub update_direct_addrs: Counter,
 
@@ -88,77 +88,12 @@ pub struct Metrics {
     /// Number of consecutive failure resets (path recovered).
     pub path_failure_resets: Counter,
     /// Histogram of packet loss rates (0.0-1.0) observed on UDP paths.
+    #[default(Histogram::new(vec![0.0, 0.01, 0.05, 0.1, 0.2, 0.5, 1.0]))]
     pub path_packet_loss_rate: Histogram,
     /// Histogram of RTT variance (in milliseconds) as a congestion indicator.
+    #[default(Histogram::new(vec![0.0, 1.0, 5.0, 10.0, 20.0, 50.0, 100.0, 200.0]))]
     pub path_rtt_variance_ms: Histogram,
     /// Histogram of path quality scores (0.0-1.0).
+    #[default(Histogram::new(vec![0.0, 0.3, 0.5, 0.7, 0.85, 0.95, 1.0]))]
     pub path_quality_score: Histogram,
 }
-
-impl Default for Metrics {
-    fn default() -> Self {
-        Self {
-            update_direct_addrs: Counter::default(),
-            send_ipv4: Counter::default(),
-            send_ipv6: Counter::default(),
-            send_relay: Counter::default(),
-            send_relay_error: Counter::default(),
-            send_data: Counter::default(),
-            send_data_network_down: Counter::default(),
-            recv_data_relay: Counter::default(),
-            recv_data_ipv4: Counter::default(),
-            recv_data_ipv6: Counter::default(),
-            recv_datagrams: Counter::default(),
-            recv_gro_datagrams: Counter::default(),
-            send_disco_udp: Counter::default(),
-            send_disco_relay: Counter::default(),
-            sent_disco_udp: Counter::default(),
-            sent_disco_relay: Counter::default(),
-            sent_disco_ping: Counter::default(),
-            sent_disco_pong: Counter::default(),
-            sent_disco_call_me_maybe: Counter::default(),
-            recv_disco_bad_key: Counter::default(),
-            recv_disco_bad_parse: Counter::default(),
-            recv_disco_udp: Counter::default(),
-            recv_disco_relay: Counter::default(),
-            recv_disco_ping: Counter::default(),
-            recv_disco_pong: Counter::default(),
-            recv_disco_call_me_maybe: Counter::default(),
-            recv_disco_call_me_maybe_bad_disco: Counter::default(),
-            relay_home_change: Counter::default(),
-            num_direct_conns_added: Counter::default(),
-            num_direct_conns_removed: Counter::default(),
-            num_relay_conns_added: Counter::default(),
-            num_relay_conns_removed: Counter::default(),
-            actor_tick_main: Counter::default(),
-            actor_tick_msg: Counter::default(),
-            actor_tick_re_stun: Counter::default(),
-            actor_tick_portmap_changed: Counter::default(),
-            actor_tick_direct_addr_heartbeat: Counter::default(),
-            actor_link_change: Counter::default(),
-            actor_tick_other: Counter::default(),
-            nodes_contacted: Counter::default(),
-            nodes_contacted_directly: Counter::default(),
-            connection_handshake_success: Counter::default(),
-            connection_became_direct: Counter::default(),
-            path_marked_outdated: Counter::default(),
-            path_ping_failures: Counter::default(),
-            path_failure_resets: Counter::default(),
-            path_packet_loss_rate: packet_loss_buckets(),
-            path_rtt_variance_ms: rtt_variance_buckets(),
-            path_quality_score: quality_score_buckets(),
-        }
-    }
-}
-
-fn packet_loss_buckets() -> Histogram {
-    Histogram::new(vec![0.0, 0.01, 0.05, 0.1, 0.2, 0.5, 1.0])
-}
-
-fn rtt_variance_buckets() -> Histogram {
-    Histogram::new(vec![0.0, 1.0, 5.0, 10.0, 20.0, 50.0, 100.0, 200.0])
-}
-
-fn quality_score_buckets() -> Histogram {
-    Histogram::new(vec![0.0, 0.3, 0.5, 0.7, 0.85, 0.95, 1.0])
-}