Skip to content

Commit 94e93e7

Browse files
authored
Merge of #6424
2 parents 8188e03 + acfe400 commit 94e93e7

File tree

59 files changed

+364
-323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+364
-323
lines changed

Cargo.lock

Lines changed: 184 additions & 189 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ members = [
3030
"common/eth2_interop_keypairs",
3131
"common/eth2_network_config",
3232
"common/eth2_wallet_manager",
33-
"common/lighthouse_metrics",
33+
"common/metrics",
3434
"common/lighthouse_version",
3535
"common/lockfile",
3636
"common/logging",
@@ -141,6 +141,7 @@ milhouse = "0.3"
141141
num_cpus = "1"
142142
parking_lot = "0.12"
143143
paste = "1"
144+
prometheus = "0.13"
144145
quickcheck = "1"
145146
quickcheck_macros = "1"
146147
quote = "1"
@@ -213,7 +214,7 @@ gossipsub = { path = "beacon_node/lighthouse_network/gossipsub/" }
213214
http_api = { path = "beacon_node/http_api" }
214215
int_to_bytes = { path = "consensus/int_to_bytes" }
215216
kzg = { path = "crypto/kzg" }
216-
lighthouse_metrics = { path = "common/lighthouse_metrics" }
217+
metrics = { path = "common/metrics" }
217218
lighthouse_network = { path = "beacon_node/lighthouse_network" }
218219
lighthouse_version = { path = "common/lighthouse_version" }
219220
lockfile = { path = "common/lockfile" }

beacon_node/beacon_chain/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ hex = { workspace = true }
4242
int_to_bytes = { workspace = true }
4343
itertools = { workspace = true }
4444
kzg = { workspace = true }
45-
lighthouse_metrics = { workspace = true }
45+
metrics = { workspace = true }
4646
lighthouse_version = { workspace = true }
4747
logging = { workspace = true }
4848
lru = { workspace = true }

beacon_node/beacon_chain/src/block_verification.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ use derivative::Derivative;
7070
use eth2::types::{BlockGossip, EventKind};
7171
use execution_layer::PayloadStatus;
7272
pub use fork_choice::{AttestationFromBlock, PayloadVerificationStatus};
73-
use lighthouse_metrics::TryExt;
73+
use metrics::TryExt;
7474
use parking_lot::RwLockReadGuard;
7575
use proto_array::Block as ProtoBlock;
7676
use safe_arith::ArithError;

beacon_node/beacon_chain/src/metrics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::observed_attesters::SlotSubcommitteeIndex;
22
use crate::types::consts::altair::SYNC_COMMITTEE_SUBNET_COUNT;
33
use crate::{BeaconChain, BeaconChainError, BeaconChainTypes};
44
use bls::FixedBytesExtended;
5-
pub use lighthouse_metrics::*;
5+
pub use metrics::*;
66
use slot_clock::SlotClock;
77
use std::sync::LazyLock;
88
use types::{BeaconState, Epoch, EthSpec, Hash256, Slot};

beacon_node/beacon_chain/tests/attestation_production.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ async fn produces_attestations_from_attestation_simulator_service() {
8686
let expected_miss_metrics_count = 0;
8787
let expected_hit_metrics_count =
8888
num_blocks_produced - UNAGGREGATED_ATTESTATION_LAG_SLOTS as u64;
89-
lighthouse_metrics::gather().iter().for_each(|mf| {
89+
metrics::gather().iter().for_each(|mf| {
9090
if hit_prometheus_metrics.contains(&mf.get_name()) {
9191
assert_eq!(
9292
mf.get_metric()[0].get_counter().get_value() as u64,

beacon_node/beacon_processor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ task_executor = { workspace = true }
1616
slot_clock = { workspace = true }
1717
lighthouse_network = { workspace = true }
1818
types = { workspace = true }
19-
lighthouse_metrics = { workspace = true }
19+
metrics = { workspace = true }
2020
parking_lot = { workspace = true }
2121
num_cpus = { workspace = true }
2222
serde = { workspace = true }

beacon_node/beacon_processor/src/metrics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub use lighthouse_metrics::*;
1+
pub use metrics::*;
22
use std::sync::LazyLock;
33

44
/*

beacon_node/client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ sensitive_url = { workspace = true }
3333
genesis = { workspace = true }
3434
task_executor = { workspace = true }
3535
environment = { workspace = true }
36-
lighthouse_metrics = { workspace = true }
36+
metrics = { workspace = true }
3737
time = "0.3.5"
3838
directory = { workspace = true }
3939
http_api = { workspace = true }

beacon_node/client/src/metrics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub use lighthouse_metrics::*;
1+
pub use metrics::*;
22
use std::sync::LazyLock;
33

44
pub static SYNC_SLOTS_PER_SECOND: LazyLock<Result<IntGauge>> = LazyLock::new(|| {

0 commit comments

Comments
 (0)