chore(bin): refactor out cli logic

Author: refcell

Cargo.lock

@@ -36,7 +36,6 @@ clap.workspace = true
 eyre.workspace = true
 strum.workspace = true
 serde_json.workspace = true
-tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 
 # Tracing
 tracing.workspace = true

bin/consensus/Cargo.toml

@@ -2,7 +2,7 @@
 
 use std::{fs::File, path::PathBuf, sync::Arc, time::Duration};
 
-use base_cli_utils::{CliStyles, GlobalArgs, LogConfig, MetricsArgs};
+use base_cli_utils::{CliStyles, GlobalArgs, LogConfig, RuntimeManager};
 use base_client_cli::{
     BuilderClientArgs, JwtSecret, L1ClientArgs, L2ClientArgs, P2PArgs, RollupBoostFlags, RpcArgs,
     SequencerArgs,
@@ -89,10 +89,18 @@ impl Cli {
         Self::init_logs(&self.global)?;
 
         // Initialize unified metrics
-        Self::init_metrics(&self.global.metrics)?;
+        self.global.metrics.init_with(|| {
+            kona_gossip::Metrics::init();
+            kona_disc::Metrics::init();
+            kona_engine::Metrics::init();
+            kona_node_service::Metrics::init();
+            kona_derive::Metrics::init();
+            kona_providers_alloy::Metrics::init();
+            version::VersionInfo::from_build().register_version_metrics();
+        })?;
 
         // Run the subcommand.
-        Self::run_until_ctrl_c(self.exec(&self.global))
+        RuntimeManager::run_until_ctrl_c(self.exec(&self.global))
     }
 
     /// Run the Node subcommand.
@@ -241,45 +249,4 @@ impl Cli {
         LogConfig::new(args.logging.clone()).init_tracing_subscriber(Some(filter))?;
         Ok(())
     }
-
-    /// Initializes metrics for a Kona application, including Prometheus and node-specific metrics.
-    /// Initialize the tracing stack and Prometheus metrics recorder.
-    ///
-    /// This function should be called at the beginning of the program.
-    pub fn init_metrics(args: &MetricsArgs) -> eyre::Result<()> {
-        args.init_metrics()?;
-        if args.enabled {
-            kona_gossip::Metrics::init();
-            kona_disc::Metrics::init();
-            kona_engine::Metrics::init();
-            kona_node_service::Metrics::init();
-            kona_derive::Metrics::init();
-            kona_providers_alloy::Metrics::init();
-            version::VersionInfo::from_build().register_version_metrics();
-        }
-        Ok(())
-    }
-
-    /// Run until ctrl-c is pressed.
-    pub fn run_until_ctrl_c<F>(fut: F) -> eyre::Result<()>
-    where
-        F: std::future::Future<Output = eyre::Result<()>>,
-    {
-        let rt = Self::tokio_runtime().map_err(|e| eyre::eyre!(e))?;
-        rt.block_on(async move {
-            tokio::select! {
-                res = fut => res,
-                _ = tokio::signal::ctrl_c() => {
-                    tracing::info!(target: "cli", "Received Ctrl-C, shutting down...");
-                    Ok(())
-                }
-            }
-        })
-    }
-
-    /// Creates a new default tokio multi-thread [Runtime](tokio::runtime::Runtime) with all
-    /// features enabled
-    pub fn tokio_runtime() -> Result<tokio::runtime::Runtime, std::io::Error> {
-        tokio::runtime::Builder::new_multi_thread().enable_all().build()
-    }
 }

bin/consensus/src/cli.rs

@@ -41,16 +41,32 @@ impl Default for MetricsArgs {
 }
 
 impl MetricsArgs {
-    /// Initialize the tracing stack and Prometheus metrics recorder.
+    /// Initialize the Prometheus metrics recorder.
     ///
     /// This function should be called at the beginning of the program.
-    pub fn init_metrics(&self) -> Result<(), metrics_exporter_prometheus::BuildError> {
+    pub fn init(&self) -> Result<(), metrics_exporter_prometheus::BuildError> {
         if self.enabled {
             PrometheusServer::init(self.addr, self.port)?;
         }
 
         Ok(())
     }
+
+    /// Initialize the Prometheus metrics recorder and run a callback to initialize
+    /// subsystem-specific metrics if metrics are enabled.
+    ///
+    /// This function should be called at the beginning of the program.
+    pub fn init_with<F>(&self, f: F) -> Result<(), metrics_exporter_prometheus::BuildError>
+    where
+        F: FnOnce(),
+    {
+        if self.enabled {
+            PrometheusServer::init(self.addr, self.port)?;
+            f();
+        }
+
+        Ok(())
+    }
 }
 
 #[cfg(test)]

crates/shared/cli-utils/src/metrics.rs

@@ -7,43 +7,26 @@ use std::future::Future;
 pub struct RuntimeManager;
 
 impl RuntimeManager {
-    /// Builds a multi-threaded Tokio runtime with all features enabled.
-    pub fn build_runtime() -> eyre::Result<tokio::runtime::Runtime> {
-        tokio::runtime::Builder::new_multi_thread()
-            .enable_all()
-            .build()
-            .map_err(|e| eyre::eyre!("Failed to build tokio runtime: {}", e))
+    /// Creates a new default tokio multi-thread [Runtime](tokio::runtime::Runtime) with all
+    /// features enabled.
+    pub fn tokio_runtime() -> Result<tokio::runtime::Runtime, std::io::Error> {
+        tokio::runtime::Builder::new_multi_thread().enable_all().build()
     }
 
-    /// Runs a future to completion, returning early on Ctrl+C.
-    pub async fn run_until_ctrl_c<F>(fut: F) -> eyre::Result<()>
-    where
-        F: Future<Output = ()>,
-    {
-        let ctrl_c = async {
-            tokio::signal::ctrl_c().await.expect("Failed to install Ctrl+C handler");
-        };
-
-        tokio::select! {
-            biased;
-            () = ctrl_c => Ok(()),
-            () = fut => Ok(()),
-        }
-    }
-
-    /// Runs a fallible future to completion, returning early on Ctrl+C.
-    pub async fn run_until_ctrl_c_fallible<F>(fut: F) -> eyre::Result<()>
+    /// Run a fallible future until ctrl-c is pressed.
+    pub fn run_until_ctrl_c<F>(fut: F) -> eyre::Result<()>
     where
         F: Future<Output = eyre::Result<()>>,
     {
-        let ctrl_c = async {
-            tokio::signal::ctrl_c().await.expect("Failed to install Ctrl+C handler");
-        };
-
-        tokio::select! {
-            biased;
-            () = ctrl_c => Ok(()),
-            result = fut => result,
-        }
+        let rt = Self::tokio_runtime().map_err(|e| eyre::eyre!(e))?;
+        rt.block_on(async move {
+            tokio::select! {
+                res = fut => res,
+                _ = tokio::signal::ctrl_c() => {
+                    tracing::info!(target: "cli", "Received Ctrl-C, shutting down...");
+                    Ok(())
+                }
+            }
+        })
     }
 }