Modularize tracing executor and metrics rename (#6424)

* Tracing executor and metrics rename

* Appease clippy

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

beacon_node/beacon_chain/Cargo.toml

@@ -42,7 +42,7 @@ hex = { workspace = true }
 int_to_bytes = { workspace = true }
 itertools = { workspace = true }
 kzg = { workspace = true }
-lighthouse_metrics = { workspace = true }
+metrics = { workspace = true }
 lighthouse_version = { workspace = true }
 logging = { workspace = true }
 lru = { workspace = true }

beacon_node/beacon_chain/src/block_verification.rs

@@ -70,7 +70,7 @@ use derivative::Derivative;
 use eth2::types::{BlockGossip, EventKind};
 use execution_layer::PayloadStatus;
 pub use fork_choice::{AttestationFromBlock, PayloadVerificationStatus};
-use lighthouse_metrics::TryExt;
+use metrics::TryExt;
 use parking_lot::RwLockReadGuard;
 use proto_array::Block as ProtoBlock;
 use safe_arith::ArithError;

beacon_node/beacon_chain/src/metrics.rs

@@ -2,7 +2,7 @@ use crate::observed_attesters::SlotSubcommitteeIndex;
 use crate::types::consts::altair::SYNC_COMMITTEE_SUBNET_COUNT;
 use crate::{BeaconChain, BeaconChainError, BeaconChainTypes};
 use bls::FixedBytesExtended;
-pub use lighthouse_metrics::*;
+pub use metrics::*;
 use slot_clock::SlotClock;
 use std::sync::LazyLock;
 use types::{BeaconState, Epoch, EthSpec, Hash256, Slot};

beacon_node/beacon_chain/tests/attestation_production.rs

@@ -86,7 +86,7 @@ async fn produces_attestations_from_attestation_simulator_service() {
     let expected_miss_metrics_count = 0;
     let expected_hit_metrics_count =
         num_blocks_produced - UNAGGREGATED_ATTESTATION_LAG_SLOTS as u64;
-    lighthouse_metrics::gather().iter().for_each(|mf| {
+    metrics::gather().iter().for_each(|mf| {
         if hit_prometheus_metrics.contains(&mf.get_name()) {
             assert_eq!(
                 mf.get_metric()[0].get_counter().get_value() as u64,