feat: add metrics

Author: prestwich

src/tasks/block/sim.rs

@@ -6,7 +6,7 @@ use crate::{
     tasks::env::SimEnv,
 };
 use alloy::{eips::BlockId, network::Ethereum};
-use init4_bin_base::utils::calc::SlotCalculator;
+use init4_bin_base::{deps::metrics::counter, utils::calc::SlotCalculator};
 use signet_sim::{BlockBuild, BuiltBlock, SimCache};
 use signet_types::constants::SignetSystemConstants;
 use std::time::{Duration, Instant};
@@ -17,7 +17,7 @@ use tokio::{
     },
     task::JoinHandle,
 };
-use tracing::{Instrument, Span, instrument};
+use tracing::{Instrument, Span, debug, instrument};
 use trevm::revm::{
     context::BlockEnv,
     database::{AlloyDB, WrapDatabaseAsync},
@@ -140,11 +140,12 @@ impl Simulator {
         );
 
         let built_block = block_build.build().in_current_span().await;
-        tracing::debug!(
+        debug!(
             tx_count = built_block.tx_count(),
             block_number = built_block.block_number(),
             "block simulation completed",
         );
+        counter!("signet.builder.simulated_blocks").increment(1);
 
         Ok(built_block)
     }
@@ -167,7 +168,7 @@ impl Simulator {
         cache: SimCache,
         submit_sender: mpsc::UnboundedSender<SimResult>,
     ) -> JoinHandle<()> {
-        tracing::debug!("starting simulator task");
+        debug!("starting simulator task");
 
         tokio::spawn(async move { self.run_simulator(constants, cache, submit_sender).await })
     }
@@ -220,7 +221,6 @@ impl Simulator {
                 continue;
             };
 
-            let _guard = span.clone().entered();
             span_debug!(span, tx_count = block.transactions().len(), "built simulated block");
             let _ = submit_sender.send(SimResult { block, sim_env });
         }

src/tasks/submit/flashbots.rs

@@ -13,10 +13,10 @@ use alloy::{
 };
 use eyre::OptionExt;
 use init4_bin_base::{
-    deps::tracing::{Instrument, debug},
-    utils::signer::LocalOrAws,
+    deps::metrics::counter, deps::tracing::Instrument, utils::signer::LocalOrAws,
 };
 use tokio::{sync::mpsc, task::JoinHandle};
+use tracing::debug;
 
 /// Handles construction, simulation, and submission of rollup blocks to the
 /// Flashbots network.
@@ -127,12 +127,13 @@ impl FlashbotsTask {
             );
 
             // Prepare a MEV bundle with the configured call type from the sim result
-            let bundle = match self.prepare(&sim_result).instrument(span.clone()).await {
-                Ok(b) => b,
-                Err(e) => {
-                    span_error!(span, %e, "failed to prepare MEV bundle");
-                    continue;
-                }
+            let Ok(bundle) =
+                self.prepare(&sim_result).instrument(span.clone()).await.inspect_err(|error| {
+                    counter!("signet.builder.flashbots.bundle_prep_failures").increment(1);
+                    span_debug!(span, %error, "bundle preparation failed");
+                })
+            else {
+                continue;
             };
 
             // Send the bundle to Flashbots
@@ -143,17 +144,16 @@ impl FlashbotsTask {
                 .await;
 
             match response {
-                Ok(Some(hash)) => {
+                Ok(resp) => {
+                    counter!("signet.builder.flashbots.bundles_submitted").increment(1);
                     span_debug!(
                         span,
-                        hash = hash.bundle_hash.to_string(),
+                        hash = resp.map(|r| r.bundle_hash.to_string()),
                         "received bundle hash after submitted to flashbots"
                     );
                 }
-                Ok(None) => {
-                    span_debug!(span, "received no bundle hash after submitted to flashbots");
-                }
                 Err(err) => {
+                    counter!("signet.builder.flashbots.submission_failures").increment(1);
                     span_error!(span, %err, "MEV bundle submission failed - error returned");
                 }
             }