Merge of #6424

Author: mergify[bot]

Cargo.lock

@@ -30,7 +30,7 @@ members = [
     "common/eth2_interop_keypairs",
     "common/eth2_network_config",
     "common/eth2_wallet_manager",
-    "common/lighthouse_metrics",
+    "common/metrics",
     "common/lighthouse_version",
     "common/lockfile",
     "common/logging",
@@ -141,6 +141,7 @@ milhouse = "0.3"
 num_cpus = "1"
 parking_lot = "0.12"
 paste = "1"
+prometheus = "0.13"
 quickcheck = "1"
 quickcheck_macros = "1"
 quote = "1"
@@ -213,7 +214,7 @@ gossipsub = { path = "beacon_node/lighthouse_network/gossipsub/" }
 http_api = { path = "beacon_node/http_api" }
 int_to_bytes = { path = "consensus/int_to_bytes" }
 kzg = { path = "crypto/kzg" }
-lighthouse_metrics = { path = "common/lighthouse_metrics" }
+metrics = { path = "common/metrics" }
 lighthouse_network = { path = "beacon_node/lighthouse_network" }
 lighthouse_version = { path = "common/lighthouse_version" }
 lockfile = { path = "common/lockfile" }

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/Cargo.toml

@@ -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/block_verification.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/src/metrics.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,

beacon_node/beacon_chain/tests/attestation_production.rs

@@ -16,7 +16,7 @@ task_executor = { workspace = true }
 slot_clock = { workspace = true }
 lighthouse_network = { workspace = true }
 types = { workspace = true }
-lighthouse_metrics = { workspace = true }
+metrics = { workspace = true }
 parking_lot = { workspace = true }
 num_cpus = { workspace = true }
 serde = { workspace = true }

beacon_node/beacon_processor/Cargo.toml

@@ -1,4 +1,4 @@
-pub use lighthouse_metrics::*;
+pub use metrics::*;
 use std::sync::LazyLock;
 
 /*

beacon_node/beacon_processor/src/metrics.rs

@@ -33,7 +33,7 @@ sensitive_url = { workspace = true }
 genesis = { workspace = true }
 task_executor = { workspace = true }
 environment = { workspace = true }
-lighthouse_metrics = { workspace = true }
+metrics = { workspace = true }
 time = "0.3.5"
 directory = { workspace = true }
 http_api = { workspace = true }

beacon_node/client/Cargo.toml

@@ -1,4 +1,4 @@
-pub use lighthouse_metrics::*;
+pub use metrics::*;
 use std::sync::LazyLock;
 
 pub static SYNC_SLOTS_PER_SECOND: LazyLock<Result<IntGauge>> = LazyLock::new(|| {