From 232e47d15ee9ec79ce762d96c1630adee3b3ec41 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Tue, 18 Jul 2023 18:03:15 +1000 Subject: [PATCH] Remove plurals --- beacon_node/beacon_processor/src/lib.rs | 28 +++++++++---------- beacon_node/beacon_processor/src/metrics.rs | 8 +++--- .../src/work_reprocessing_queue.rs | 8 +++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/beacon_node/beacon_processor/src/lib.rs b/beacon_node/beacon_processor/src/lib.rs index b40ea38538e..4855dacf474 100644 --- a/beacon_node/beacon_processor/src/lib.rs +++ b/beacon_node/beacon_processor/src/lib.rs @@ -1225,72 +1225,72 @@ impl BeaconProcessor { self.current_workers as i64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[GOSSIP_ATTESTATION], attestation_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[GOSSIP_AGGREGATE], aggregate_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[GOSSIP_SYNC_SIGNATURE], sync_message_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[GOSSIP_SYNC_CONTRIBUTION], sync_contribution_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[GOSSIP_BLOCK], gossip_block_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[RPC_BLOCK], rpc_block_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[CHAIN_SEGMENT], chain_segment_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[CHAIN_SEGMENT_BACKFILL], backfill_chain_segment.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[GOSSIP_VOLUNTARY_EXIT], gossip_voluntary_exit_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[GOSSIP_PROPOSER_SLASHING], gossip_proposer_slashing_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[GOSSIP_ATTESTER_SLASHING], gossip_attester_slashing_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[GOSSIP_BLS_TO_EXECUTION_CHANGE], gossip_bls_to_execution_change_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[API_REQUEST_P0], api_request_p0_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_QUEUE_LENGTH, &[API_REQUEST_P1], api_request_p1_queue.len() as f64, ); diff --git a/beacon_node/beacon_processor/src/metrics.rs b/beacon_node/beacon_processor/src/metrics.rs index f02233d8a9a..ba7fbeabc82 100644 --- a/beacon_node/beacon_processor/src/metrics.rs +++ b/beacon_node/beacon_processor/src/metrics.rs @@ -47,8 +47,8 @@ lazy_static::lazy_static! { "beacon_processor_event_handling_seconds", "Time spent handling a new message and allocating it to a queue or worker." ); - pub static ref BEACON_PROCESSOR_QUEUE_LENGTHS: Result = try_create_histogram_vec_with_buckets( - "beacon_processor_queue_lengths", + pub static ref BEACON_PROCESSOR_QUEUE_LENGTH: Result = try_create_histogram_vec_with_buckets( + "beacon_processor_queue_length", "The lengths of each beacon processor event queue.", Ok(queue_length_buckets()), &["type"] @@ -57,8 +57,8 @@ lazy_static::lazy_static! { /* * Attestation reprocessing queue metrics. */ - pub static ref BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTHS: Result = try_create_histogram_vec_with_buckets( - "beacon_processor_reprocessing_queue_lengths", + pub static ref BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTH: Result = try_create_histogram_vec_with_buckets( + "beacon_processor_reprocessing_queue_length", "The lengths of each beacon processor reprocessing queue.", Ok(queue_length_buckets()), &["type"] diff --git a/beacon_node/beacon_processor/src/work_reprocessing_queue.rs b/beacon_node/beacon_processor/src/work_reprocessing_queue.rs index fdd21439083..b4ba845cf75 100644 --- a/beacon_node/beacon_processor/src/work_reprocessing_queue.rs +++ b/beacon_node/beacon_processor/src/work_reprocessing_queue.rs @@ -888,22 +888,22 @@ impl ReprocessQueue { } metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTH, &[GOSSIP_BLOCKS], self.gossip_block_delay_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTH, &[RPC_BLOCKS], self.rpc_block_delay_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTH, &[ATTESTATIONS], self.attestations_delay_queue.len() as f64, ); metrics::observe_histogram_vec( - &metrics::BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTHS, + &metrics::BEACON_PROCESSOR_REPROCESSING_QUEUE_LENGTH, &[LIGHT_CLIENT_UPDATES], self.lc_updates_delay_queue.len() as f64, );