apollo_committer: add number of modifications of each trie per block

Author: rotem-starkware

crates/apollo_committer/src/committer.rs

@@ -53,6 +53,9 @@ use crate::metrics::{
     register_metrics,
     COMPUTE_DURATION_PER_BLOCK,
     COMPUTE_DURATION_PER_BLOCK_HIST,
+    COUNT_CLASSES_TRIE_MODIFICATIONS_PER_BLOCK,
+    COUNT_CONTRACTS_TRIE_MODIFICATIONS_PER_BLOCK,
+    COUNT_STORAGE_TRIES_MODIFICATIONS_PER_BLOCK,
     OFFSET,
     READ_DB_ENTRIES_PER_BLOCK,
     READ_DURATION_PER_BLOCK,
@@ -449,7 +452,9 @@ impl ComponentStarter for ApolloCommitter {
     }
 }
 
-fn update_metrics(BlockMeasurement { n_reads, n_writes, durations, .. }: &BlockMeasurement) {
+fn update_metrics(
+    BlockMeasurement { n_reads, n_writes, durations, modifications_counts }: &BlockMeasurement,
+) {
     READ_DURATION_PER_BLOCK.set_lossy(durations.read);
     READ_DURATION_PER_BLOCK_HIST.record_lossy(durations.read);
     READ_DB_ENTRIES_PER_BLOCK.set_lossy(*n_reads);
@@ -458,4 +463,7 @@ fn update_metrics(BlockMeasurement { n_reads, n_writes, durations, .. }: &BlockM
     WRITE_DURATION_PER_BLOCK.set_lossy(durations.write);
     WRITE_DURATION_PER_BLOCK_HIST.record_lossy(durations.write);
     WRITE_DB_ENTRIES_PER_BLOCK.set_lossy(*n_writes);
+    COUNT_STORAGE_TRIES_MODIFICATIONS_PER_BLOCK.set_lossy(modifications_counts.storage_tries);
+    COUNT_CONTRACTS_TRIE_MODIFICATIONS_PER_BLOCK.set_lossy(modifications_counts.contracts_trie);
+    COUNT_CLASSES_TRIE_MODIFICATIONS_PER_BLOCK.set_lossy(modifications_counts.classes_trie);
 }

crates/apollo_committer/src/metrics.rs

@@ -18,6 +18,21 @@ define_metrics!(
             "offset",
             "The next block number to commit"
         },
+        MetricGauge {
+            COUNT_STORAGE_TRIES_MODIFICATIONS_PER_BLOCK,
+            "count_storage_tries_modifications_per_block",
+            "Number of all storage tries modifications"
+        },
+        MetricGauge {
+            COUNT_CONTRACTS_TRIE_MODIFICATIONS_PER_BLOCK,
+            "count_contracts_trie_modifications_per_block",
+            "Number of contracts trie modifications"
+        },
+        MetricGauge {
+            COUNT_CLASSES_TRIE_MODIFICATIONS_PER_BLOCK,
+            "count_classes_trie_modifications_per_block",
+            "Number of classes trie modifications"
+        },
         MetricHistogram {
             READ_DURATION_PER_BLOCK_HIST,
             "read_duration_per_block_hist",
@@ -64,6 +79,9 @@ define_metrics!(
 pub fn register_metrics(offset: BlockNumber) {
     OFFSET.register();
     OFFSET.set_lossy(offset.0);
+    COUNT_STORAGE_TRIES_MODIFICATIONS_PER_BLOCK.register();
+    COUNT_CONTRACTS_TRIE_MODIFICATIONS_PER_BLOCK.register();
+    COUNT_CLASSES_TRIE_MODIFICATIONS_PER_BLOCK.register();
     READ_DURATION_PER_BLOCK_HIST.register();
     READ_DURATION_PER_BLOCK.register();
     READ_DB_ENTRIES_PER_BLOCK.register();