apollo_state_sync: remove reconstruction of proccesed txs metrics (#10490)

Author: noamsp-starkware

Cargo.lock

@@ -47,7 +47,6 @@
   "state_sync_config.rpc_config.ip": "0.0.0.0",
   "state_sync_config.rpc_config.max_events_chunk_size": 1000,
   "state_sync_config.rpc_config.max_events_keys": 100,
-  "state_sync_config.should_replay_processed_txs_metric": false,
   "state_sync_config.storage_config.db_config.enforce_file_exists": false,
   "state_sync_config.storage_config.db_config.growth_step": 67108864,
   "state_sync_config.storage_config.db_config.max_readers": 8192,

crates/apollo_deployments/resources/app_configs/replacer_state_sync_config.json

@@ -47,7 +47,6 @@
   "state_sync_config.rpc_config.max_events_chunk_size": 1000,
   "state_sync_config.rpc_config.max_events_keys": 100,
   "state_sync_config.rpc_config.ip": "0.0.0.0",
-  "state_sync_config.should_replay_processed_txs_metric": false,
   "state_sync_config.storage_config.db_config.enforce_file_exists": false,
   "state_sync_config.storage_config.db_config.growth_step": 67108864,
   "state_sync_config.storage_config.db_config.max_readers": 8192,

crates/apollo_deployments/resources/app_configs/state_sync_config.json

@@ -717,7 +717,6 @@ pub fn create_state_sync_configs(
                 port: rpc_ports.remove(0),
                 ..Default::default()
             },
-            should_replay_processed_txs_metric: true,
             ..Default::default()
         })
         .collect()

crates/apollo_integration_tests/src/utils.rs

@@ -3164,11 +3164,6 @@
     "pointer_target": "starknet_url",
     "privacy": "Public"
   },
-  "state_sync_config.should_replay_processed_txs_metric": {
-    "description": "Whether to replay processed transactions.",
-    "privacy": "Public",
-    "value": false
-  },
   "state_sync_config.storage_config.db_config.chain_id": {
     "description": "The chain to follow. For more details see https://docs.starknet.io/documentation/architecture_and_concepts/Blocks/transactions/#chain-id.",
     "pointer_target": "chain_id",

crates/apollo_node/resources/config_schema.json

@@ -133,7 +133,6 @@ impl StateSyncRunner {
             network_config,
             revert_config,
             rpc_config,
-            should_replay_processed_txs_metric,
         } = config;
 
         let StateSyncResources {
@@ -144,8 +143,7 @@ impl StateSyncRunner {
             pending_classes,
         } = StateSyncResources::new(&storage_config);
 
-        let register_metrics_future =
-            register_metrics(should_replay_processed_txs_metric, storage_reader.clone()).boxed();
+        let register_metrics_future = register_metrics(storage_reader.clone()).boxed();
 
         // Creating the JSON-RPC server future
         // Located above the revert if block since we would like to be able to query the RPC server

crates/apollo_state_sync/src/runner/mod.rs

@@ -3,13 +3,8 @@ use std::path::PathBuf;
 use std::result;
 
 use apollo_central_sync_config::config::{CentralSourceConfig, SyncConfig};
-use apollo_config::dumping::{
-    prepend_sub_config_name,
-    ser_optional_sub_config,
-    ser_param,
-    SerializeConfig,
-};
-use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
+use apollo_config::dumping::{prepend_sub_config_name, ser_optional_sub_config, SerializeConfig};
+use apollo_config::{ParamPath, SerializedParam};
 use apollo_network::NetworkConfig;
 use apollo_p2p_sync_config::config::P2pSyncClientConfig;
 use apollo_reverts::RevertConfig;
@@ -37,20 +32,11 @@ pub struct StateSyncConfig {
     pub revert_config: RevertConfig,
     #[validate(nested)]
     pub rpc_config: RpcConfig,
-    // TODO(noamsp): Remove this after fixing the replay procedure.
-    // This is a temporary solution by disabling the replay procedure in production and enabling it
-    // in integration tests.
-    pub should_replay_processed_txs_metric: bool,
 }
 
 impl SerializeConfig for StateSyncConfig {
     fn dump(&self) -> BTreeMap<ParamPath, SerializedParam> {
-        let mut config = BTreeMap::from_iter([ser_param(
-            "should_replay_processed_txs_metric",
-            &self.should_replay_processed_txs_metric,
-            "Whether to replay processed transactions.",
-            ParamPrivacyInput::Public,
-        )]);
+        let mut config = BTreeMap::new();
         config.extend(prepend_sub_config_name(self.storage_config.dump(), "storage_config"));
         config.extend(ser_optional_sub_config(&self.network_config, "network_config"));
         config.extend(prepend_sub_config_name(self.revert_config.dump(), "revert_config"));
@@ -94,7 +80,6 @@ impl Default for StateSyncConfig {
             network_config: Some(NetworkConfig { port: STATE_SYNC_PORT, ..Default::default() }),
             revert_config: RevertConfig::default(),
             rpc_config: RpcConfig::default(),
-            should_replay_processed_txs_metric: false,
         }
     }
 }

crates/apollo_state_sync_config/src/config.rs

@@ -16,6 +16,3 @@ apollo_infra.workspace = true
 apollo_metrics.workspace = true
 apollo_state_sync_types.workspace = true
 apollo_storage.workspace = true
-starknet_api.workspace = true
-tokio.workspace = true
-tracing.workspace = true

crates/apollo_state_sync_metrics/Cargo.toml

@@ -5,7 +5,6 @@ use apollo_infra::metrics::{
     RemoteClientMetrics,
     RemoteServerMetrics,
 };
-use apollo_metrics::metrics::MetricDetails;
 use apollo_metrics::{define_infra_metrics, define_metrics};
 use apollo_state_sync_types::communication::STATE_SYNC_REQUEST_LABELS;
 use apollo_storage::body::BodyStorageReader;
@@ -15,9 +14,6 @@ use apollo_storage::db::TransactionKind;
 use apollo_storage::header::HeaderStorageReader;
 use apollo_storage::state::StateStorageReader;
 use apollo_storage::{StorageReader, StorageTxn};
-use starknet_api::block::BlockNumber;
-use tracing::debug;
-
 define_infra_metrics!(state_sync);
 
 define_metrics!(
@@ -45,10 +41,7 @@ define_metrics!(
     },
 );
 
-pub async fn register_metrics(
-    should_replay_processed_txs_metric: bool,
-    storage_reader: StorageReader,
-) {
+pub async fn register_metrics(storage_reader: StorageReader) {
     STATE_SYNC_HEADER_MARKER.register();
     STATE_SYNC_BODY_MARKER.register();
     STATE_SYNC_STATE_MARKER.register();
@@ -61,14 +54,6 @@ pub async fn register_metrics(
     STATE_SYNC_REVERTED_UP_TO_AND_INCLUDING.register();
     let txn = storage_reader.begin_ro_txn().unwrap();
     update_marker_metrics(&txn);
-    if should_replay_processed_txs_metric {
-        let storage_reader = storage_reader.clone();
-        let _ = tokio::task::spawn_blocking(move || {
-            let txn = storage_reader.begin_ro_txn().unwrap();
-            reconstruct_processed_transactions_metric(&txn);
-        })
-        .await;
-    }
 }
 
 pub fn update_marker_metrics<Mode: TransactionKind>(txn: &StorageTxn<'_, Mode>) {
@@ -83,35 +68,3 @@ pub fn update_marker_metrics<Mode: TransactionKind>(txn: &StorageTxn<'_, Mode>)
     STATE_SYNC_COMPILED_CLASS_MARKER
         .set_lossy(txn.get_compiled_class_marker().expect("Should have a compiled class marker").0);
 }
-
-// TODO(noamsp): Fix replay procedure by adding the value to the storage, this way we wont need to
-// replay all the transactions.
-fn reconstruct_processed_transactions_metric(txn: &StorageTxn<'_, impl TransactionKind>) {
-    let block_marker = txn.get_body_marker().expect("Should have a body marker");
-
-    debug!("Starting to count all transactions in the storage");
-    // Early return if no blocks to process
-    if block_marker.0 == 0 {
-        return;
-    }
-
-    let mut total_transactions = 0;
-
-    // Process all blocks efficiently
-    for block_number in 0..block_marker.0 {
-        if let Ok(Some(transaction_hashes)) =
-            txn.get_block_transaction_hashes(BlockNumber(block_number))
-        {
-            total_transactions += transaction_hashes.len();
-        }
-    }
-
-    debug!(
-        "Finished counting all transactions in the storage. Incrementing {} metric with value: \
-         {total_transactions}",
-        STATE_SYNC_PROCESSED_TRANSACTIONS.get_name(),
-    );
-    // Set the metric once with the total count
-    STATE_SYNC_PROCESSED_TRANSACTIONS
-        .increment(total_transactions.try_into().expect("Failed to convert usize to u64"));
-}