fix: follow up metrics fixes (matter-labs#648)

## What ❔ Fixes for previous metrics PRs. * Fix oldest unproved block by round (we have `manually_skipped` status in DB, is this correct?), SQL query and number of rounds * Rename some API server metrics * May filter count work incorrect? ## Why ❔ For metrics to work correctly. ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`.
Domsu001 · Dec 11, 2023 · a317c7a · a317c7a
1 parent 0b820fa
commit a317c7a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/core/lib/dal/sqlx-data.json b/core/lib/dal/sqlx-data.json
@@ -1686,6 +1686,26 @@
     },
     "query": "UPDATE transactions SET in_mempool = FALSE WHERE in_mempool = TRUE"
   },
+  "1f84a62da9b5e00dff0353de76b28f22220a5a859a9955afc2ad59135bd25e6c": {
+    "describe": {
+      "columns": [
+        {
+          "name": "l1_batch_number",
+          "ordinal": 0,
+          "type_info": "Int8"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int2"
+        ]
+      }
+    },
+    "query": "\n                    SELECT l1_batch_number\n                    FROM prover_jobs_fri \n                    WHERE status <> 'skipped'\n                    AND status <> 'successful'\n                    AND aggregation_round = $1\n                    ORDER BY l1_batch_number ASC \n                    LIMIT 1\n                "
+  },
   "1faf6552c221c75b7232b55210c0c37be76a57ec9dc94584b6ccb562e8b182f2": {
     "describe": {
       "columns": [
@@ -8376,26 +8396,6 @@
     },
     "query": "SELECT MAX(operation_number) as \"max?\" FROM storage_logs WHERE miniblock_number = $1"
   },
-  "a7c7e8f036404d24dc6bfa184a84b92d8f73ca034970481af34b6163e66dc59a": {
-    "describe": {
-      "columns": [
-        {
-          "name": "l1_batch_number",
-          "ordinal": 0,
-          "type_info": "Int8"
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Int2"
-        ]
-      }
-    },
-    "query": "\n                    SELECT l1_batch_number \n                    FROM prover_jobs_fri \n                    WHERE status <> 'skipped'\n                    AND status <> 'successful'\n                    AND aggregation_round = $1 \n                    ORDER BY l1_batch_number ASC \n                    LIMIT 1\n                "
-  },
   "a8b32073a67ad77caab11e73a5cac5aa5b5382648ff95d6787a309eb3f64d434": {
     "describe": {
       "columns": [],

diff --git a/core/lib/dal/src/fri_prover_dal.rs b/core/lib/dal/src/fri_prover_dal.rs
@@ -347,11 +347,11 @@ impl FriProverDal<'_, '_> {
     ) -> Option<L1BatchNumber> {
         sqlx::query!(
             r#"
-                    SELECT l1_batch_number 
+                    SELECT l1_batch_number
                     FROM prover_jobs_fri 
                     WHERE status <> 'skipped'
                     AND status <> 'successful'
-                    AND aggregation_round = $1 
+                    AND aggregation_round = $1
                     ORDER BY l1_batch_number ASC 
                     LIMIT 1
                 "#,

diff --git a/core/lib/zksync_core/src/api_server/web3/metrics.rs b/core/lib/zksync_core/src/api_server/web3/metrics.rs
@@ -217,7 +217,7 @@ impl From<&TypedFilter> for FilterType {
 #[metrics(prefix = "api_web3_filter")]
 pub(super) struct FilterMetrics {
     /// Number of currently active filters grouped by the filter type
-    pub metrics_count: Family<FilterType, Gauge>,
+    pub filter_count: Family<FilterType, Gauge>,
     /// Time in seconds between consecutive requests to the filter grouped by the filter type
     #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
     pub request_frequency: Family<FilterType, Histogram<Duration>>,
@@ -226,7 +226,7 @@ pub(super) struct FilterMetrics {
     pub filter_lifetime: Family<FilterType, Histogram<Duration>>,
     /// Number of requests to the filter grouped by the filter type
     #[metrics(buckets = Buckets::exponential(1.0..=1048576.0, 2.0))]
-    pub filter_count: Family<FilterType, Histogram<usize>>,
+    pub request_count: Family<FilterType, Histogram<usize>>,
 }
 
 #[vise::register]

diff --git a/core/lib/zksync_core/src/api_server/web3/state.rs b/core/lib/zksync_core/src/api_server/web3/state.rs
@@ -559,7 +559,7 @@ struct InstalledFilter {
 
 impl InstalledFilter {
     pub fn new(filter: TypedFilter) -> Self {
-        let guard = FILTER_METRICS.metrics_count[&FilterType::from(&filter)].inc_guard(1);
+        let guard = FILTER_METRICS.filter_count[&FilterType::from(&filter)].inc_guard(1);
         Self {
             filter,
             _guard: guard,
@@ -585,7 +585,7 @@ impl Drop for InstalledFilter {
     fn drop(&mut self) {
         let filter_type = FilterType::from(&self.filter);
 
-        FILTER_METRICS.filter_count[&filter_type].observe(self.request_count);
+        FILTER_METRICS.request_count[&filter_type].observe(self.request_count);
         FILTER_METRICS.filter_lifetime[&filter_type].observe(self.created_at.elapsed());
     }
 }

diff --git a/core/lib/zksync_core/src/house_keeper/fri_prover_queue_monitor.rs b/core/lib/zksync_core/src/house_keeper/fri_prover_queue_monitor.rs
@@ -112,7 +112,7 @@ impl PeriodicJob for FriProverStatsReporter {
             )
         }
 
-        for aggregation_round in 0..2 {
+        for aggregation_round in 0..3 {
             if let Some(l1_batch_number) = conn
                 .fri_prover_jobs_dal()
                 .min_unproved_l1_batch_number_for_aggregation_round(aggregation_round.into())