Modularize tracing executor and metrics rename (#6424)

* Tracing executor and metrics rename

* Appease clippy

* Merge branch 'unstable' into modularise-task-executor

validator_client/src/http_metrics/metrics.rs

@@ -38,7 +38,7 @@ pub const SUBSCRIPTIONS: &str = "subscriptions";
 pub const LOCAL_KEYSTORE: &str = "local_keystore";
 pub const WEB3SIGNER: &str = "web3signer";
 
-pub use lighthouse_metrics::*;
+pub use metrics::*;
 
 pub static GENESIS_DISTANCE: LazyLock<Result<IntGauge>> = LazyLock::new(|| {
     try_create_int_gauge(
@@ -316,9 +316,7 @@ pub fn gather_prometheus_metrics<E: EthSpec>(
 
     warp_utils::metrics::scrape_health_metrics();
 
-    encoder
-        .encode(&lighthouse_metrics::gather(), &mut buffer)
-        .unwrap();
+    encoder.encode(&metrics::gather(), &mut buffer).unwrap();
 
     String::from_utf8(buffer).map_err(|e| format!("Failed to encode prometheus info: {:?}", e))
 }

validator_client/src/initialized_validators.rs

@@ -16,8 +16,8 @@ use account_utils::{
     ZeroizeString,
 };
 use eth2_keystore::Keystore;
-use lighthouse_metrics::set_gauge;
 use lockfile::{Lockfile, LockfileError};
+use metrics::set_gauge;
 use parking_lot::{MappedMutexGuard, Mutex, MutexGuard};
 use reqwest::{Certificate, Client, Error as ReqwestError, Identity};
 use slog::{debug, error, info, warn, Logger};

validator_client/src/lib.rs

@@ -25,7 +25,7 @@ pub use beacon_node_health::BeaconNodeSyncDistanceTiers;
 pub use cli::cli_app;
 pub use config::Config;
 use initialized_validators::InitializedValidators;
-use lighthouse_metrics::set_gauge;
+use metrics::set_gauge;
 use monitoring_api::{MonitoringHttpClient, ProcessType};
 use sensitive_url::SensitiveUrl;
 pub use slashing_protection::{SlashingDatabase, SLASHING_PROTECTION_FILENAME};

validator_client/src/notifier.rs

@@ -1,6 +1,6 @@
 use crate::http_metrics;
 use crate::{DutiesService, ProductionValidatorClient};
-use lighthouse_metrics::set_gauge;
+use metrics::set_gauge;
 use slog::{debug, error, info, Logger};
 use slot_clock::SlotClock;
 use tokio::time::{sleep, Duration};