apollo_dashboard: create MetricCommon trait

matanl-starkware · matanl-starkware · commit ca12bc4bb562 · 2025-10-30T15:14:00.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/apollo_dashboard/src/alert_definitions.rs b/crates/apollo_dashboard/src/alert_definitions.rs
@@ -23,6 +23,7 @@ use apollo_l1_provider::metrics::{
     L1_MESSAGE_SCRAPER_REORG_DETECTED,
 };
 use apollo_mempool_p2p::metrics::MEMPOOL_P2P_NUM_CONNECTED_PEERS;
+use apollo_metrics::MetricCommon;
 use apollo_storage::metrics::{
     BATCHER_STORAGE_OPEN_READ_TRANSACTIONS,
     CLASS_MANAGER_STORAGE_OPEN_READ_TRANSACTIONS,
diff --git a/crates/apollo_dashboard/src/alert_scenarios/block_production_delay.rs b/crates/apollo_dashboard/src/alert_scenarios/block_production_delay.rs
@@ -1,6 +1,7 @@
 use apollo_consensus::metrics::{CONSENSUS_BLOCK_NUMBER, CONSENSUS_ROUND_ABOVE_ZERO};
 use apollo_consensus_manager::metrics::CONSENSUS_NUM_CONNECTED_PEERS;
 use apollo_consensus_orchestrator::metrics::CENDE_WRITE_BLOB_FAILURE;
+use apollo_metrics::MetricCommon;
 
 use crate::alert_definitions::BLOCK_TIME_SEC;
 use crate::alerts::{
diff --git a/crates/apollo_dashboard/src/alert_scenarios/block_production_halt.rs b/crates/apollo_dashboard/src/alert_scenarios/block_production_halt.rs
@@ -3,6 +3,7 @@ use std::time::Duration;
 use apollo_batcher::metrics::BATCHED_TRANSACTIONS;
 use apollo_consensus::metrics::{CONSENSUS_BLOCK_NUMBER, CONSENSUS_ROUND};
 use apollo_consensus_manager::metrics::CONSENSUS_NUM_CONNECTED_PEERS;
+use apollo_metrics::MetricCommon;
 
 use crate::alert_definitions::BLOCK_TIME_SEC;
 use crate::alerts::{
diff --git a/crates/apollo_dashboard/src/alert_scenarios/l1_gas_prices.rs b/crates/apollo_dashboard/src/alert_scenarios/l1_gas_prices.rs
@@ -3,6 +3,7 @@ use apollo_l1_gas_price::metrics::{
     L1_GAS_PRICE_PROVIDER_INSUFFICIENT_HISTORY,
     L1_GAS_PRICE_SCRAPER_SUCCESS_COUNT,
 };
+use apollo_metrics::MetricCommon;
 
 use crate::alerts::{
     Alert,
diff --git a/crates/apollo_dashboard/src/alert_scenarios/l1_handlers.rs b/crates/apollo_dashboard/src/alert_scenarios/l1_handlers.rs
@@ -1,4 +1,5 @@
 use apollo_l1_provider::metrics::L1_MESSAGE_SCRAPER_SUCCESS_COUNT;
+use apollo_metrics::MetricCommon;
 
 use crate::alerts::{
     Alert,
diff --git a/crates/apollo_dashboard/src/alert_scenarios/mempool_size.rs b/crates/apollo_dashboard/src/alert_scenarios/mempool_size.rs
@@ -4,6 +4,7 @@ use apollo_mempool::metrics::{
     MEMPOOL_POOL_SIZE,
     MEMPOOL_TRANSACTIONS_DROPPED,
 };
+use apollo_metrics::MetricCommon;
 
 use crate::alerts::{
     Alert,
diff --git a/crates/apollo_dashboard/src/alert_scenarios/preconfirmed.rs b/crates/apollo_dashboard/src/alert_scenarios/preconfirmed.rs
@@ -36,6 +36,8 @@ fn get_preconfirmed_block_not_written(
     )
 }
 
+use apollo_metrics::MetricCommon;
+
 pub(crate) fn get_preconfirmed_block_not_written_vec() -> Vec<Alert> {
     vec![
         get_preconfirmed_block_not_written(
diff --git a/crates/apollo_dashboard/src/alert_scenarios/sync_halt.rs b/crates/apollo_dashboard/src/alert_scenarios/sync_halt.rs
@@ -1,5 +1,6 @@
 use std::time::Duration;
 
+use apollo_metrics::MetricCommon;
 use apollo_state_sync_metrics::metrics::{
     CENTRAL_SYNC_CENTRAL_BLOCK_MARKER,
     STATE_SYNC_CLASS_MANAGER_MARKER,
diff --git a/crates/apollo_dashboard/src/alert_scenarios/tps.rs b/crates/apollo_dashboard/src/alert_scenarios/tps.rs
@@ -6,6 +6,7 @@ use apollo_gateway::metrics::{
 };
 use apollo_http_server::metrics::ADDED_TRANSACTIONS_SUCCESS;
 use apollo_mempool::metrics::MEMPOOL_TRANSACTIONS_RECEIVED;
+use apollo_metrics::MetricCommon;
 
 use crate::alerts::{
     Alert,
diff --git a/crates/apollo_dashboard/src/alert_scenarios/transaction_delays.rs b/crates/apollo_dashboard/src/alert_scenarios/transaction_delays.rs
@@ -1,6 +1,7 @@
 use apollo_batcher::metrics::NUM_TRANSACTION_IN_BLOCK;
 use apollo_http_server::metrics::HTTP_SERVER_ADD_TX_LATENCY;
 use apollo_mempool_p2p::metrics::MEMPOOL_P2P_NUM_CONNECTED_PEERS;
+use apollo_metrics::MetricCommon;
 
 use crate::alerts::{
     Alert,
diff --git a/crates/apollo_dashboard/src/alert_scenarios/transaction_failures.rs b/crates/apollo_dashboard/src/alert_scenarios/transaction_failures.rs
@@ -5,6 +5,7 @@ use apollo_http_server::metrics::{
     ADDED_TRANSACTIONS_TOTAL,
 };
 use apollo_mempool::metrics::{MEMPOOL_TRANSACTIONS_DROPPED, MEMPOOL_TRANSACTIONS_RECEIVED};
+use apollo_metrics::MetricCommon;
 
 use crate::alerts::{
     Alert,
diff --git a/crates/apollo_dashboard/src/dashboard.rs b/crates/apollo_dashboard/src/dashboard.rs
@@ -8,6 +8,7 @@ use apollo_infra::metrics::{
 use apollo_infra::requests::LABEL_NAME_REQUEST_VARIANT;
 use apollo_metrics::metrics::{
     LabeledMetricHistogram,
+    MetricCommon,
     MetricCounter,
     MetricGauge,
     MetricHistogram,
diff --git a/crates/apollo_dashboard/src/dashboard_test.rs b/crates/apollo_dashboard/src/dashboard_test.rs
@@ -1,5 +1,5 @@
 use apollo_infra_utils::test_utils::assert_json_eq;
-use apollo_metrics::metrics::{MetricCounter, MetricScope};
+use apollo_metrics::metrics::{MetricCommon, MetricCounter, MetricScope};
 
 use crate::alerts::{
     Alert,
diff --git a/crates/apollo_dashboard/src/panels/batcher.rs b/crates/apollo_dashboard/src/panels/batcher.rs
@@ -12,6 +12,7 @@ use apollo_consensus_orchestrator::metrics::{
     CONSENSUS_NUM_BATCHES_IN_PROPOSAL,
     CONSENSUS_NUM_TXS_IN_PROPOSAL,
 };
+use apollo_metrics::MetricCommon;
 
 use crate::dashboard::{Panel, PanelType, Row, Unit};
 
diff --git a/crates/apollo_dashboard/src/panels/blockifier.rs b/crates/apollo_dashboard/src/panels/blockifier.rs
@@ -3,6 +3,7 @@ use apollo_batcher::metrics::{
     PROVING_GAS_IN_LAST_BLOCK,
     SIERRA_GAS_IN_LAST_BLOCK,
 };
+use apollo_metrics::MetricCommon;
 use blockifier::metrics::{
     BLOCKIFIER_METRIC_RATE_DURATION,
     CALLS_RUNNING_NATIVE,
diff --git a/crates/apollo_dashboard/src/panels/consensus.rs b/crates/apollo_dashboard/src/panels/consensus.rs
@@ -38,6 +38,7 @@ use apollo_consensus_orchestrator::metrics::{
     LABEL_CENDE_FAILURE_REASON,
     LABEL_VALIDATE_PROPOSAL_FAILURE_REASON,
 };
+use apollo_metrics::MetricCommon;
 use apollo_network::network_manager::metrics::{
     LABEL_NAME_BROADCAST_DROP_REASON,
     LABEL_NAME_EVENT_TYPE,
diff --git a/crates/apollo_dashboard/src/panels/gateway.rs b/crates/apollo_dashboard/src/panels/gateway.rs
@@ -11,6 +11,7 @@ use apollo_gateway::metrics::{
     LABEL_NAME_SOURCE,
     LABEL_NAME_TX_TYPE as GATEWAY_LABEL_NAME_TX_TYPE,
 };
+use apollo_metrics::MetricCommon;
 
 use crate::dashboard::{Panel, PanelType, Row, Unit};
 
diff --git a/crates/apollo_dashboard/src/panels/http_server.rs b/crates/apollo_dashboard/src/panels/http_server.rs
@@ -6,6 +6,7 @@ use apollo_http_server::metrics::{
     ADDED_TRANSACTIONS_TOTAL,
     HTTP_SERVER_ADD_TX_LATENCY,
 };
+use apollo_metrics::MetricCommon;
 
 use crate::dashboard::{Panel, PanelType, Row, Unit};
 
diff --git a/crates/apollo_dashboard/src/panels/l1_gas_price.rs b/crates/apollo_dashboard/src/panels/l1_gas_price.rs
@@ -11,6 +11,7 @@ use apollo_l1_gas_price::metrics::{
     L1_GAS_PRICE_SCRAPER_SUCCESS_COUNT,
 };
 use apollo_l1_gas_price_types::DEFAULT_ETH_TO_FRI_RATE;
+use apollo_metrics::MetricCommon;
 
 use crate::dashboard::{get_time_since_last_increase_expr, Panel, PanelType, Row, Unit};
 
diff --git a/crates/apollo_dashboard/src/panels/l1_provider.rs b/crates/apollo_dashboard/src/panels/l1_provider.rs
@@ -3,6 +3,7 @@ use apollo_l1_provider::metrics::{
     L1_MESSAGE_SCRAPER_REORG_DETECTED,
     L1_MESSAGE_SCRAPER_SUCCESS_COUNT,
 };
+use apollo_metrics::MetricCommon;
 
 use crate::dashboard::{get_time_since_last_increase_expr, Panel, PanelType, Row, Unit};
 
diff --git a/crates/apollo_dashboard/src/panels/mempool.rs b/crates/apollo_dashboard/src/panels/mempool.rs
@@ -11,6 +11,7 @@ use apollo_mempool::metrics::{
     TRANSACTION_TIME_SPENT_UNTIL_BATCHED,
     TRANSACTION_TIME_SPENT_UNTIL_COMMITTED,
 };
+use apollo_metrics::MetricCommon;
 
 use crate::dashboard::{Panel, PanelType, Row, Unit};
 
diff --git a/crates/apollo_dashboard/src/panels/mempool_p2p.rs b/crates/apollo_dashboard/src/panels/mempool_p2p.rs
@@ -6,6 +6,7 @@ use apollo_mempool_p2p::metrics::{
     MEMPOOL_P2P_NUM_RECEIVED_MESSAGES,
     MEMPOOL_P2P_NUM_SENT_MESSAGES,
 };
+use apollo_metrics::MetricCommon;
 use apollo_network::network_manager::metrics::{
     LABEL_NAME_BROADCAST_DROP_REASON,
     LABEL_NAME_EVENT_TYPE,
diff --git a/crates/apollo_dashboard/src/panels/sierra_compiler.rs b/crates/apollo_dashboard/src/panels/sierra_compiler.rs
@@ -1,5 +1,6 @@
 use apollo_class_manager::metrics::{CLASS_SIZES, N_CLASSES};
 use apollo_compile_to_casm::metrics::COMPILATION_DURATION;
+use apollo_metrics::MetricCommon;
 
 use crate::dashboard::{Panel, PanelType, Row, Unit};
 
diff --git a/crates/apollo_dashboard/src/panels/state_sync.rs b/crates/apollo_dashboard/src/panels/state_sync.rs
@@ -1,3 +1,4 @@
+use apollo_metrics::MetricCommon;
 use apollo_state_sync_metrics::metrics::{
     CENTRAL_SYNC_CENTRAL_BLOCK_MARKER,
     P2P_SYNC_NUM_ACTIVE_INBOUND_SESSIONS,
diff --git a/crates/apollo_integration_tests/Cargo.toml b/crates/apollo_integration_tests/Cargo.toml
@@ -40,6 +40,7 @@ apollo_l1_provider_config.workspace = true
 apollo_l1_scraper_config.workspace = true
 apollo_mempool_config.workspace = true
 apollo_mempool_p2p_config.workspace = true
+apollo_metrics.workspace = true
 apollo_monitoring_endpoint = { workspace = true, features = ["testing"] }
 apollo_monitoring_endpoint_config.workspace = true
 apollo_network = { workspace = true, features = ["testing"] }
diff --git a/crates/apollo_integration_tests/src/monitoring_utils.rs b/crates/apollo_integration_tests/src/monitoring_utils.rs
@@ -2,6 +2,7 @@ use apollo_batcher::metrics::{REVERTED_TRANSACTIONS, STORAGE_HEIGHT};
 use apollo_consensus::metrics::CONSENSUS_DECISIONS_REACHED_BY_CONSENSUS;
 use apollo_infra_utils::run_until::run_until;
 use apollo_infra_utils::tracing::{CustomLogger, TraceLevel};
+use apollo_metrics::metrics::MetricCommon;
 use apollo_monitoring_endpoint::test_utils::MonitoringClient;
 use apollo_state_sync_metrics::metrics::{
     STATE_SYNC_BODY_MARKER,
diff --git a/crates/apollo_metrics/src/lib.rs b/crates/apollo_metrics/src/lib.rs
@@ -4,3 +4,5 @@ pub mod metrics;
 
 // Its being exported here to be used in define_metrics macro.
 pub use paste;
+
+pub use crate::metrics::MetricCommon;
diff --git a/crates/apollo_metrics/src/metrics.rs b/crates/apollo_metrics/src/metrics.rs
diff --git a/crates/apollo_proc_macros_tests/tests/latency_histogram.rs b/crates/apollo_proc_macros_tests/tests/latency_histogram.rs
diff --git a/crates/apollo_state_sync_metrics/src/metrics.rs b/crates/apollo_state_sync_metrics/src/metrics.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`use apollo_l1_provider::metrics::L1_MESSAGE_SCRAPER_SUCCESS_COUNT;`
	`2`	`+use apollo_metrics::MetricCommon;`
`2`	`3`
`3`	`4`	`use crate::alerts::{`
`4`	`5`	`Alert,`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ fn get_preconfirmed_block_not_written(`
`36`	`36`	`)`
`37`	`37`	`}`
`38`	`38`
	`39`	`+use apollo_metrics::MetricCommon;`
	`40`	`+`
`39`	`41`	`pub(crate) fn get_preconfirmed_block_not_written_vec() -> Vec<Alert> {`
`40`	`42`	`vec![`
`41`	`43`	`get_preconfirmed_block_not_written(`