cleanup and refactor spans

Author: dylanlott

src/tasks/submit/flashbots.rs

@@ -126,10 +126,6 @@ impl FlashbotsTask {
                 span_debug!(span, "received empty block - skipping");
                 continue;
             }
-
-            let host_block_number = sim_result.host_block_number();
-            let ru_block_number = sim_result.block_number();
-            let rollup_tx_count = sim_result.block.tx_count();
             span_debug!(span, "flashbots task received block");
 
             // Prepare a MEV bundle with the configured call type from the sim result
@@ -146,9 +142,6 @@ impl FlashbotsTask {
             let submit_span = debug_span!(
                 parent: &span,
                 "flashbots.submit",
-                host_block_number,
-                ru_block_number,
-                rollup_tx_count
             );
 
             // Send the bundle to Flashbots, instrumenting the send future so all
@@ -157,25 +150,26 @@ impl FlashbotsTask {
                 self.flashbots()
                     .send_mev_bundle(bundle.clone())
                     .with_auth(self.signer.clone())
+                    .into_future()
+                    .instrument(submit_span.clone())
                     .await
             }
-            .instrument(submit_span.clone())
             .await;
 
-            match response {
-                Ok(resp) => {
-                    counter!("signet.builder.flashbots.bundles_submitted").increment(1);
-                    span_debug!(
-                        submit_span,
-                        hash = resp.map(|r| r.bundle_hash.to_string()),
-                        "received bundle hash after submitted to flashbots"
-                    );
-                }
-                Err(err) => {
-                    counter!("signet.builder.flashbots.submission_failures").increment(1);
+            let Ok(resp) = &response else {
+                counter!("signet.builder.flashbots.submission_failures").increment(1);
+                if let Err(err) = &response {
                     span_error!(submit_span, %err, "MEV bundle submission failed - error returned");
                 }
-            }
+                continue;
+            };
+
+            counter!("signet.builder.flashbots.bundles_submitted").increment(1);
+            span_debug!(
+                submit_span,
+                hash = resp.as_ref().map(|r| r.bundle_hash.to_string()),
+                "received bundle hash after submitted to flashbots"
+            );
         }
     }