bench: add ipv6 option and metrics feature

Author: dignifiedquire

iroh/bench/Cargo.toml

@@ -8,8 +8,8 @@ publish = false
 [dependencies]
 bytes = "1.7"
 hdrhistogram = { version = "7.2", default-features = false }
-iroh = { path = ".." }
-iroh-metrics = "0.37"
+iroh = { path = "..", default-features = false }
+iroh-metrics = { version = "0.37", optional = true }
 n0-future = "0.3.0"
 n0-error = "0.1.0"
 quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
@@ -28,5 +28,6 @@ tracing-subscriber = { version = "0.3.0", default-features = false, features = [
 ] }
 
 [features]
-default = []
+default = ["metrics"]
+metrics = ["iroh/metrics", "iroh-metrics"]
 local-relay = ["iroh/test-utils"]

iroh/bench/src/bin/bulk.rs

@@ -1,9 +1,11 @@
+#[cfg(feature = "metrics")]
 use std::collections::BTreeMap;
 
 use clap::Parser;
 #[cfg(not(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd")))]
 use iroh_bench::quinn;
 use iroh_bench::{Commands, Opt, configure_tracing_subscriber, iroh, rt, s2n};
+#[cfg(feature = "metrics")]
 use iroh_metrics::{MetricValue, MetricsGroup};
 use n0_error::Result;
 
@@ -52,6 +54,7 @@ pub fn run_iroh(opt: Opt) -> Result<()> {
         iroh::server_endpoint(&runtime, &relay_url, &opt)
     };
 
+    #[cfg(feature = "metrics")]
     let endpoint_metrics = endpoint.metrics().clone();
 
     let server_thread = std::thread::spawn(move || {
@@ -86,6 +89,7 @@ pub fn run_iroh(opt: Opt) -> Result<()> {
         }
     }
 
+    #[cfg(feature = "metrics")]
     if opt.metrics {
         // print metrics
         println!("\nMetrics:");
@@ -158,6 +162,7 @@ pub fn run_s2n(_opt: s2n::Opt) -> Result<()> {
     unimplemented!()
 }
 
+#[cfg(feature = "metrics")]
 fn collect_and_print(category: &'static str, metrics: &dyn MetricsGroup) {
     let mut map = BTreeMap::new();
     for item in metrics.iter() {

iroh/bench/src/iroh.rs

@@ -133,10 +133,9 @@ pub fn transport_config(max_streams: usize, initial_mtu: u16) -> TransportConfig
     config.max_concurrent_uni_streams(max_streams.try_into().unwrap());
     config.initial_mtu(initial_mtu);
 
-    // TODO: re-enable when we upgrade quinn version
-    // let mut acks = quinn::AckFrequencyConfig::default();
-    // acks.ack_eliciting_threshold(10u32.into());
-    // config.ack_frequency_config(Some(acks));
+    let mut acks = quinn::AckFrequencyConfig::default();
+    acks.ack_eliciting_threshold(10u32.into());
+    config.ack_frequency_config(Some(acks));
 
     config
 }

iroh/bench/src/lib.rs

@@ -74,6 +74,8 @@ pub struct Opt {
     #[cfg(feature = "local-relay")]
     #[clap(long, default_value_t = false)]
     pub only_relay: bool,
+    #[clap(long, default_value_t = false)]
+    pub use_ipv6: bool,
 }
 
 pub enum EndpointSelector {

iroh/bench/src/quinn.rs

@@ -1,5 +1,5 @@
 use std::{
-    net::{IpAddr, Ipv4Addr, SocketAddr},
+    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
     sync::Arc,
     time::{Duration, Instant},
 };
@@ -32,13 +32,15 @@ pub fn server_endpoint(
     let mut server_config = quinn::ServerConfig::with_single_cert(cert_chain, key).unwrap();
     server_config.transport = Arc::new(transport_config(opt.max_streams, opt.initial_mtu));
 
+    let addr = if opt.use_ipv6 {
+        IpAddr::V6(Ipv6Addr::LOCALHOST)
+    } else {
+        IpAddr::V4(Ipv4Addr::LOCALHOST)
+    };
+
     let endpoint = {
         let _guard = rt.enter();
-        quinn::Endpoint::server(
-            server_config,
-            SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 0),
-        )
-        .unwrap()
+        quinn::Endpoint::server(server_config, SocketAddr::new(addr, 0)).unwrap()
     };
     let server_addr = endpoint.local_addr().unwrap();
     (server_addr, endpoint)
@@ -69,8 +71,13 @@ pub async fn connect_client(
     server_cert: CertificateDer<'_>,
     opt: Opt,
 ) -> Result<(::quinn::Endpoint, Connection)> {
-    let endpoint =
-        quinn::Endpoint::client(SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 0)).unwrap();
+    let addr = if opt.use_ipv6 {
+        IpAddr::V6(Ipv6Addr::LOCALHOST)
+    } else {
+        IpAddr::V4(Ipv4Addr::LOCALHOST)
+    };
+
+    let endpoint = quinn::Endpoint::client(SocketAddr::new(addr, 0)).unwrap();
 
     let mut roots = RootCertStore::empty();
     roots.add(server_cert).anyerr()?;
@@ -103,11 +110,11 @@ pub fn transport_config(max_streams: usize, initial_mtu: u16) -> TransportConfig
     let mut config = TransportConfig::default();
     config.max_concurrent_uni_streams(max_streams.try_into().unwrap());
     config.initial_mtu(initial_mtu);
+    config.max_concurrent_multipath_paths(16);
 
-    // TODO: re-enable when we upgrade quinn version
-    // let mut acks = quinn::AckFrequencyConfig::default();
-    // acks.ack_eliciting_threshold(10u32.into());
-    // config.ack_frequency_config(Some(acks));
+    let mut acks = quinn::AckFrequencyConfig::default();
+    acks.ack_eliciting_threshold(10u32.into());
+    config.ack_frequency_config(Some(acks));
 
     config
 }