Merge branch 'main' into feature/storing-call-data-in-quotes

crates/driver/src/domain/mempools.rs

@@ -103,6 +103,7 @@ impl Mempools {
         block_stream.next().await;
 
         let hash = mempool.submit(tx.clone(), settlement.gas, solver).await?;
+        tracing::debug!(?hash, "submitted tx to the mempool");
 
         // Wait for the transaction to be mined, expired or failing.
         let result = async {

crates/driver/src/infra/api/routes/settle/mod.rs

@@ -42,7 +42,9 @@ async fn route(
     // aborts the endpoint handler code.
     // This can happen due do connection issues or when the autopilot aborts
     // the `/settle` call when we reach the submission deadline.
-    Ok(tokio::task::spawn(handle_request)
-        .await
-        .unwrap_or_else(|_| Err(competition::Error::SubmissionError))?)
+    Ok(
+        ::observe::request_id::spawn_task_with_current_request_id(handle_request)
+            .await
+            .unwrap_or_else(|_| Err(competition::Error::SubmissionError))?,
+    )
 }

crates/observe/src/request_id.rs

@@ -16,7 +16,8 @@
 //! And when we issue requests to another process we can simply fetch the
 //! current identifier specific to our task and send that along with the
 //! request.
-use std::future::Future;
+use {std::future::Future, tokio::task::JoinHandle};
+
 tokio::task_local! {
     pub static REQUEST_ID: String;
 }
@@ -39,6 +40,20 @@ where
     REQUEST_ID.scope(id, scope).await
 }
 
+/// Spawns a new task and ensures it uses the same request id as the current
+/// task (if present). This allows for tracing requests across task boundaries.
+pub fn spawn_task_with_current_request_id<F>(future: F) -> JoinHandle<F::Output>
+where
+    F: Future + Send + 'static,
+    F::Output: Send + 'static,
+{
+    if let Some(id) = get_task_local_storage() {
+        tokio::task::spawn(REQUEST_ID.scope(id, future))
+    } else {
+        tokio::task::spawn(future)
+    }
+}
+
 /// Takes a `tower::Service` and embeds it in a `make_service` function that
 /// spawns one of these services per incoming request.
 /// But crucially before spawning that service task local storage will be