chore: clean up tracing a bit

Author: prestwich

bin/builder.rs

@@ -11,13 +11,14 @@ use signet_sim::SimCache;
 use signet_types::SlotCalculator;
 use std::sync::Arc;
 use tokio::select;
+use tracing::info_span;
 
 // Note: Must be set to `multi_thread` to support async tasks.
 // See: https://docs.rs/tokio/latest/tokio/attr.main.html
 #[tokio::main(flavor = "multi_thread")]
 async fn main() -> eyre::Result<()> {
     let _guard = init4_bin_base::init4();
-    let init_span_guard = tracing::info_span!("builder initialization");
+    let init_span_guard = info_span!("builder initialization");
 
     let config = BuilderConfig::load_from_env()?.clone();
     let constants = config.load_pecorino_constants();

src/tasks/bundler.rs

@@ -7,7 +7,7 @@ use signet_bundle::SignetEthBundle;
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel};
 use tokio::task::JoinHandle;
 use tokio::time;
-use tracing::{Instrument, debug, trace};
+use tracing::{Instrument, debug, trace, warn};
 
 pub use crate::config::BuilderConfig;
 
@@ -60,7 +60,7 @@ impl BundlePoller {
     pub async fn check_bundle_cache(&mut self) -> eyre::Result<Vec<Bundle>> {
         let bundle_url: Url = Url::parse(&self.config.tx_pool_url)?.join("bundles")?;
         let Some(token) = self.token.read() else {
-            tracing::warn!("No token available, skipping bundle fetch");
+            warn!("No token available, skipping bundle fetch");
             return Ok(vec![]);
         };
 

src/tasks/submit.rs

@@ -73,17 +73,15 @@ pub struct SubmitTask {
 }
 
 impl SubmitTask {
+    #[instrument(skip(self))]
     async fn sup_quincey(&self, sig_request: &SignRequest) -> eyre::Result<SignResponse> {
         tracing::info!(
             host_block_number = %sig_request.host_block_number,
             ru_chain_id = %sig_request.ru_chain_id,
             "pinging quincey for signature"
         );
 
-        let Some(token) = self.token.read() else {
-            tracing::error!("no token available");
-            return Err(eyre!("no token available"));
-        };
+        let Some(token) = self.token.read() else { bail!("no token available") };
 
         let resp: reqwest::Response = self
             .client