From 248b6b5905e9c44b5e0c2af6abae450898801beb Mon Sep 17 00:00:00 2001
From: greged93 <82421016+greged93@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:39:25 +0200
Subject: [PATCH] fix: task executor metrics (#11738)

---
 bin/reth/src/cli/mod.rs         | 5 +++++
 crates/cli/commands/src/node.rs | 5 -----
 crates/tasks/src/lib.rs         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/reth/src/cli/mod.rs b/bin/reth/src/cli/mod.rs
index cca801da3..01f8f73e7 100644
--- a/bin/reth/src/cli/mod.rs
+++ b/bin/reth/src/cli/mod.rs
@@ -18,6 +18,7 @@ use reth_db::DatabaseEnv;
 use reth_ethereum_cli::chainspec::EthereumChainSpecParser;
 use reth_node_builder::{NodeBuilder, WithLaunchContext};
 use reth_node_ethereum::{EthExecutorProvider, EthereumNode};
+use reth_node_metrics::recorder::install_prometheus_recorder;
 use reth_tracing::FileWorkerGuard;
 use std::{ffi::OsString, fmt, future::Future, sync::Arc};
 use tracing::info;
@@ -145,6 +146,10 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>, Ext: clap::Args + fmt::Debug> Cl
         let _guard = self.init_tracing()?;
         info!(target: "reth::cli", "Initialized tracing, debug log directory: {}", self.logs.log_file_directory);
 
+        // Install the prometheus recorder to be sure to record task
+        // executor's metrics
+        let _ = install_prometheus_recorder();
+
         let runner = CliRunner::default();
         match self.command {
             Commands::Node(command) => {
diff --git a/crates/cli/commands/src/node.rs b/crates/cli/commands/src/node.rs
index 5b1a87e06..b099a2c05 100644
--- a/crates/cli/commands/src/node.rs
+++ b/crates/cli/commands/src/node.rs
@@ -16,7 +16,6 @@ use reth_node_core::{
     node_config::NodeConfig,
     version,
 };
-use reth_node_metrics::recorder::install_prometheus_recorder;
 use std::{ffi::OsString, fmt, future::Future, net::SocketAddr, path::PathBuf, sync::Arc};
 
 /// Start the node
@@ -180,10 +179,6 @@ impl<
             pruning,
         };
 
-        // Register the prometheus recorder before creating the database,
-        // because database init needs it to register metrics.
-        let _ = install_prometheus_recorder();
-
         let data_dir = node_config.datadir();
         let db_path = data_dir.db();
 
diff --git a/crates/tasks/src/lib.rs b/crates/tasks/src/lib.rs
index a0070698f..28b5eaba9 100644
--- a/crates/tasks/src/lib.rs
+++ b/crates/tasks/src/lib.rs
@@ -288,7 +288,7 @@ pub struct TaskExecutor {
     on_shutdown: Shutdown,
     /// Sender half for sending panic signals to this type
     panicked_tasks_tx: UnboundedSender<PanickedTaskError>,
-    // Task Executor Metrics
+    /// Task Executor Metrics
     metrics: TaskExecutorMetrics,
     /// How many [`GracefulShutdown`] tasks are currently active
     graceful_tasks: Arc<AtomicUsize>,