From f248af8b26438f1e5db4a9e6ba1e566617e65408 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Tue, 18 Nov 2025 12:37:31 -0300 Subject: [PATCH 1/2] renaming to remove metrics_ suffix --- cmd/ethrex/initializers.rs | 2 +- crates/blockchain/blockchain.rs | 2 +- crates/blockchain/fork_choice.rs | 2 +- crates/blockchain/metrics/api.rs | 4 ++-- crates/blockchain/metrics/{metrics_blocks.rs => blocks.rs} | 0 crates/blockchain/metrics/mod.rs | 6 +++--- .../blockchain/metrics/{metrics_process.rs => process.rs} | 0 .../metrics/{metrics_transactions.rs => transactions.rs} | 0 crates/blockchain/payload.rs | 4 ++-- crates/l2/sequencer/block_producer.rs | 2 +- crates/l2/sequencer/block_producer/payload_builder.rs | 4 ++-- crates/l2/sequencer/metrics.rs | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename crates/blockchain/metrics/{metrics_blocks.rs => blocks.rs} (100%) rename crates/blockchain/metrics/{metrics_process.rs => process.rs} (100%) rename crates/blockchain/metrics/{metrics_transactions.rs => transactions.rs} (100%) diff --git a/cmd/ethrex/initializers.rs b/cmd/ethrex/initializers.rs index 769f71a9463..d010cad165f 100644 --- a/cmd/ethrex/initializers.rs +++ b/cmd/ethrex/initializers.rs @@ -121,7 +121,7 @@ pub fn open_store(datadir: &Path) -> Store { #[cfg(feature = "rocksdb")] let engine_type = EngineType::RocksDB; #[cfg(feature = "metrics")] - ethrex_metrics::metrics_process::set_datadir_path(datadir.to_path_buf()); + ethrex_metrics::process::set_datadir_path(datadir.to_path_buf()); Store::new(datadir, engine_type).expect("Failed to create Store") } } diff --git a/crates/blockchain/blockchain.rs b/crates/blockchain/blockchain.rs index 9f02851832c..ffb4e1d8f45 100644 --- a/crates/blockchain/blockchain.rs +++ b/crates/blockchain/blockchain.rs @@ -52,7 +52,7 @@ use tokio_util::sync::CancellationToken; use vm::StoreVmDatabase; #[cfg(feature = "metrics")] -use ethrex_metrics::metrics_blocks::METRICS_BLOCKS; +use ethrex_metrics::blocks::METRICS_BLOCKS; #[cfg(feature = "c-kzg")] use ethrex_common::types::BlobsBundle; diff --git a/crates/blockchain/fork_choice.rs b/crates/blockchain/fork_choice.rs index 4fde785b610..a45d1cf5fd0 100644 --- a/crates/blockchain/fork_choice.rs +++ b/crates/blockchain/fork_choice.rs @@ -110,7 +110,7 @@ pub async fn apply_fork_choice( .await?; metrics!( - use ethrex_metrics::metrics_blocks::METRICS_BLOCKS; + use ethrex_metrics::blocks::METRICS_BLOCKS; METRICS_BLOCKS.set_head_height(head.number); ); diff --git a/crates/blockchain/metrics/api.rs b/crates/blockchain/metrics/api.rs index 53c2066a708..4d68aa8a6a3 100644 --- a/crates/blockchain/metrics/api.rs +++ b/crates/blockchain/metrics/api.rs @@ -3,8 +3,8 @@ use axum::{Router, routing::get}; use crate::profiling::gather_profiling_metrics; use crate::{ - MetricsApiError, metrics_blocks::METRICS_BLOCKS, metrics_process::METRICS_PROCESS, - metrics_transactions::METRICS_TX, + MetricsApiError, blocks::METRICS_BLOCKS, process::METRICS_PROCESS, + transactions::METRICS_TX, }; pub async fn start_prometheus_metrics_api( diff --git a/crates/blockchain/metrics/metrics_blocks.rs b/crates/blockchain/metrics/blocks.rs similarity index 100% rename from crates/blockchain/metrics/metrics_blocks.rs rename to crates/blockchain/metrics/blocks.rs diff --git a/crates/blockchain/metrics/mod.rs b/crates/blockchain/metrics/mod.rs index 5e6db632f57..781895cf64b 100644 --- a/crates/blockchain/metrics/mod.rs +++ b/crates/blockchain/metrics/mod.rs @@ -3,11 +3,11 @@ pub mod api; #[cfg(feature = "api")] pub mod l2; #[cfg(any(feature = "api", feature = "metrics"))] -pub mod metrics_blocks; +pub mod blocks; #[cfg(any(feature = "api", feature = "metrics"))] -pub mod metrics_process; +pub mod process; #[cfg(any(feature = "api", feature = "transactions"))] -pub mod metrics_transactions; +pub mod transactions; #[cfg(feature = "api")] pub mod profiling; diff --git a/crates/blockchain/metrics/metrics_process.rs b/crates/blockchain/metrics/process.rs similarity index 100% rename from crates/blockchain/metrics/metrics_process.rs rename to crates/blockchain/metrics/process.rs diff --git a/crates/blockchain/metrics/metrics_transactions.rs b/crates/blockchain/metrics/transactions.rs similarity index 100% rename from crates/blockchain/metrics/metrics_transactions.rs rename to crates/blockchain/metrics/transactions.rs diff --git a/crates/blockchain/payload.rs b/crates/blockchain/payload.rs index bef51d950c1..4a3e14e8cbe 100644 --- a/crates/blockchain/payload.rs +++ b/crates/blockchain/payload.rs @@ -27,9 +27,9 @@ use ethrex_storage::{Store, error::StoreError}; use ethrex_metrics::metrics; #[cfg(feature = "metrics")] -use ethrex_metrics::metrics_blocks::METRICS_BLOCKS; +use ethrex_metrics::blocks::METRICS_BLOCKS; #[cfg(feature = "metrics")] -use ethrex_metrics::metrics_transactions::{METRICS_TX, MetricsTxType}; +use ethrex_metrics::transactions::{METRICS_TX, MetricsTxType}; use tokio_util::sync::CancellationToken; use crate::{ diff --git a/crates/l2/sequencer/block_producer.rs b/crates/l2/sequencer/block_producer.rs index a3ba74588cd..f213dd5704b 100644 --- a/crates/l2/sequencer/block_producer.rs +++ b/crates/l2/sequencer/block_producer.rs @@ -33,7 +33,7 @@ use super::errors::BlockProducerError; use ethrex_metrics::metrics; #[cfg(feature = "metrics")] -use ethrex_metrics::{metrics_blocks::METRICS_BLOCKS, metrics_transactions::METRICS_TX}; +use ethrex_metrics::{blocks::METRICS_BLOCKS, transactions::METRICS_TX}; #[derive(Clone)] pub enum CallMessage { diff --git a/crates/l2/sequencer/block_producer/payload_builder.rs b/crates/l2/sequencer/block_producer/payload_builder.rs index af3b92e6001..49bf8b709ea 100644 --- a/crates/l2/sequencer/block_producer/payload_builder.rs +++ b/crates/l2/sequencer/block_producer/payload_builder.rs @@ -12,8 +12,8 @@ use ethrex_levm::vm::VMType; use ethrex_metrics::metrics; #[cfg(feature = "metrics")] use ethrex_metrics::{ - metrics_blocks::METRICS_BLOCKS, - metrics_transactions::{METRICS_TX, MetricsTxType}, + blocks::METRICS_BLOCKS, + transactions::{METRICS_TX, MetricsTxType}, }; use ethrex_rlp::encode::RLPEncode; use ethrex_storage::Store; diff --git a/crates/l2/sequencer/metrics.rs b/crates/l2/sequencer/metrics.rs index 82b1f6befaa..4ac6be1dcde 100644 --- a/crates/l2/sequencer/metrics.rs +++ b/crates/l2/sequencer/metrics.rs @@ -5,7 +5,7 @@ use ethrex_l2_sdk::{get_last_committed_batch, get_last_verified_batch}; #[cfg(feature = "metrics")] use ethrex_metrics::{ l2::metrics::{METRICS, MetricsBlockType, MetricsOperationType}, - metrics_transactions::METRICS_TX, + transactions::METRICS_TX, }; use ethrex_rpc::clients::eth::EthClient; use reqwest::Url; From 7477e27d2446b7c8331ceb9c21f0c4f244bd088e Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Wed, 19 Nov 2025 10:55:02 -0300 Subject: [PATCH 2/2] formatting --- crates/blockchain/metrics/api.rs | 3 +-- crates/blockchain/metrics/mod.rs | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/blockchain/metrics/api.rs b/crates/blockchain/metrics/api.rs index 4d68aa8a6a3..c740f09bcf9 100644 --- a/crates/blockchain/metrics/api.rs +++ b/crates/blockchain/metrics/api.rs @@ -3,8 +3,7 @@ use axum::{Router, routing::get}; use crate::profiling::gather_profiling_metrics; use crate::{ - MetricsApiError, blocks::METRICS_BLOCKS, process::METRICS_PROCESS, - transactions::METRICS_TX, + MetricsApiError, blocks::METRICS_BLOCKS, process::METRICS_PROCESS, transactions::METRICS_TX, }; pub async fn start_prometheus_metrics_api( diff --git a/crates/blockchain/metrics/mod.rs b/crates/blockchain/metrics/mod.rs index 781895cf64b..8047c3be413 100644 --- a/crates/blockchain/metrics/mod.rs +++ b/crates/blockchain/metrics/mod.rs @@ -1,15 +1,15 @@ #[cfg(feature = "api")] pub mod api; -#[cfg(feature = "api")] -pub mod l2; #[cfg(any(feature = "api", feature = "metrics"))] pub mod blocks; +#[cfg(feature = "api")] +pub mod l2; #[cfg(any(feature = "api", feature = "metrics"))] pub mod process; -#[cfg(any(feature = "api", feature = "transactions"))] -pub mod transactions; #[cfg(feature = "api")] pub mod profiling; +#[cfg(any(feature = "api", feature = "transactions"))] +pub mod transactions; /// A macro to conditionally enable metrics-related code. ///