Improve metrics so we could better plot them (#193)

Author: SozinM

crates/op-rbuilder/src/builders/flashblocks/payload.rs

@@ -281,9 +281,11 @@ where
             first_flashblock_offset = first_flashblock_offset.as_millis(),
             flashblocks_interval = self.config.specific.interval.as_millis(),
         );
-        ctx.metrics
-            .target_flashblock
-            .record(flashblocks_per_block as f64);
+        ctx.metrics.reduced_flashblocks_number.record(
+            self.config
+                .flashblocks_per_block()
+                .saturating_sub(flashblocks_per_block) as f64,
+        );
         ctx.metrics
             .first_flashblock_time_offset
             .record(first_flashblock_offset.as_millis() as f64);
@@ -490,9 +492,14 @@ where
                     // Exit loop if channel closed or cancelled
                     ctx.metrics.block_built_success.increment(1);
                     ctx.metrics.flashblock_count.record(flashblock_count as f64);
+                    ctx.metrics
+                        .missing_flashblocks_count
+                        .record(flashblocks_per_block.saturating_sub(flashblock_count) as f64);
                     debug!(
                         target: "payload_builder",
-                        message = "Payload building complete, channel closed or job cancelled"
+                        message = "Payload building complete, channel closed or job cancelled",
+                        missing_falshblocks = flashblocks_per_block.saturating_sub(flashblock_count),
+                        reduced_flashblocks = self.config.flashblocks_per_block().saturating_sub(flashblocks_per_block),
                     );
                     span.record("flashblock_count", flashblock_count);
                     return Ok(());
@@ -579,14 +586,17 @@ where
                 self.config.specific.interval,
             );
         };
-        self.metrics
-            .flashblock_time_drift
-            .record(time_drift.as_millis() as f64);
+        self.metrics.flashblocks_time_drift.record(
+            self.config
+                .block_time
+                .as_millis()
+                .saturating_sub(time_drift.as_millis()) as f64,
+        );
         debug!(
             target: "payload_builder",
             message = "Time drift for building round",
             ?target_time,
-            ?time_drift,
+            time_drift = self.config.block_time.as_millis().saturating_sub(time_drift.as_millis()),
             ?timestamp
         );
         // This is extra check to ensure that we would account at least for block time in case we have any timer discrepancies.

crates/op-rbuilder/src/metrics.rs

@@ -76,10 +76,12 @@ pub struct OpRBuilderMetrics {
     pub da_block_size_limit: Gauge,
     /// Da tx size limit
     pub da_tx_size_limit: Gauge,
-    /// Desired number of flashblocks
-    pub target_flashblock: Histogram,
-    /// Time drift that we account for in the beginning of block building
-    pub flashblock_time_drift: Histogram,
+    /// How much less flashblocks we issue to be on time with block construction
+    pub reduced_flashblocks_number: Histogram,
+    /// How much less flashblocks we issued in reality, comparing to calculated number for block
+    pub missing_flashblocks_count: Histogram,
+    /// How much time we have deducted from block building time
+    pub flashblocks_time_drift: Histogram,
     /// Time offset we used for first flashblock
     pub first_flashblock_time_offset: Histogram,
     /// Number of requests sent to the eth_sendBundle endpoint