chore: bump sdk and add more tracing cleanup (#196)

Author: prestwich

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "builder"
-version = "0.6.1"
+version = "0.6.2"
 description = "signet builder example"
 
 edition = "2024"

Cargo.toml

@@ -116,8 +116,7 @@ impl SimulatorTask {
     ///
     /// A `Result` containing the built block or an error.
     #[instrument(skip_all, fields(
-        tx_count = sim_items.len(),
-        millis_to_deadline = finish_by.duration_since(Instant::now()).as_millis()
+        starting_cache_size = sim_items.len()
     ))]
     pub async fn handle_build(
         &self,

src/tasks/block/sim.rs

@@ -8,7 +8,7 @@ use tokio::{
     task::JoinHandle,
     time::{self, Duration},
 };
-use tracing::{Instrument, debug, debug_span, error, trace};
+use tracing::{Instrument, debug, error, trace, trace_span};
 
 /// Poll interval for the bundle poller in milliseconds.
 const POLL_INTERVAL_MS: u64 = 1000;
@@ -71,7 +71,7 @@ impl BundlePoller {
 
     async fn task_future(mut self, outbound: UnboundedSender<TxCacheBundle>) {
         loop {
-            let span = debug_span!("BundlePoller::loop", url = %self.config.tx_pool_url);
+            let span = trace_span!("BundlePoller::loop", url = %self.config.tx_pool_url);
 
             // Enter the span for the next check.
             let _guard = span.enter();
@@ -92,7 +92,7 @@ impl BundlePoller {
                 .inspect_err(|err| debug!(%err, "Error fetching bundles"))
             {
                 let _guard = span.entered();
-                debug!(count = ?bundles.len(), "found bundles");
+                trace!(count = ?bundles.len(), "found bundles");
                 for bundle in bundles.into_iter() {
                     if let Err(err) = outbound.send(bundle) {
                         error!(err = ?err, "Failed to send bundle - channel is dropped");

src/tasks/cache/bundle.rs

@@ -9,7 +9,7 @@ use reqwest::{Client, Url};
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use tokio::{sync::mpsc, task::JoinHandle, time};
-use tracing::{Instrument, debug, debug_span, trace};
+use tracing::{Instrument, debug, debug_span, trace, trace_span};
 
 /// Poll interval for the transaction poller in milliseconds.
 const POLL_INTERVAL_MS: u64 = 1000;
@@ -114,19 +114,14 @@ impl TxPoller {
 
     async fn task_future(mut self, outbound: mpsc::UnboundedSender<TxEnvelope>) {
         loop {
-            let span = debug_span!("TxPoller::loop", url = %self.config.tx_pool_url);
-
-            // Enter the span for the next check.
-            let _guard = span.enter();
+            let span = trace_span!("TxPoller::loop", url = %self.config.tx_pool_url);
 
             // Check this here to avoid making the web request if we know
             // we don't need the results.
             if outbound.is_closed() {
                 trace!("No receivers left, shutting down");
                 break;
             }
-            // exit the span after the check.
-            drop(_guard);
 
             if let Ok(transactions) =
                 self.check_tx_cache().instrument(span.clone()).await.inspect_err(|err| {

src/tasks/cache/tx.rs

@@ -307,7 +307,9 @@ impl EnvTask {
                 self.host_provider
                     .get_block_by_number(host_block_number.into())
                     .into_future()
-                    .instrument(debug_span!(parent: &span, "EnvTask::fetch_host_block")),
+                    .instrument(
+                        debug_span!(parent: &span, "EnvTask::fetch_host_block").or_current()
+                    ),
                 // We want to check that we're able to sign for the block we're gonna start building.
                 // If not, we just want to skip all the work.
                 self.quincey.preflight_check(host_block_number + 1).in_current_span(),