From 8719896fdbeff633f390869705201e0a5888fa56 Mon Sep 17 00:00:00 2001
From: binarybaron <86064887+binarybaron@users.noreply.github.com>
Date: Thu, 24 Aug 2023 18:17:41 +0200
Subject: [PATCH] use Span::current() to pass down to tracing span to spawned
 tasks

---
 swap/src/api/request.rs    | 16 ++++++----------
 swap/src/bitcoin/wallet.rs |  3 ++-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/swap/src/api/request.rs b/swap/src/api/request.rs
index d5a2dc87..110e7b2a 100644
--- a/swap/src/api/request.rs
+++ b/swap/src/api/request.rs
@@ -178,7 +178,6 @@ impl Request {
     async fn handle_cmd(
         self,
         context: Arc<Context>,
-        tracing_span: Span,
     ) -> Result<serde_json::Value> {
         match self.cmd {
             Method::SuspendCurrentSwap => {
@@ -265,8 +264,6 @@ impl Request {
             } => {
                 context.swap_lock.acquire_swap_lock(swap_id).await?;
 
-                let tracing_span_clone = tracing_span.clone();
-
                 tokio::spawn(async move {
                     tokio::select! {
                         biased;
@@ -311,7 +308,7 @@ impl Request {
 
                             let (event_loop, mut event_loop_handle) =
                                 EventLoop::new(swap_id, swarm, seller_peer_id)?;
-                            let event_loop = tokio::spawn(event_loop.run().instrument(tracing_span_clone.clone()));
+                            let event_loop = tokio::spawn(event_loop.run().instrument(Span::current()));
 
                             let max_givable = || bitcoin_wallet.max_giveable(TxLock::script_size());
                             let estimate_fee = |amount| bitcoin_wallet.estimate_fee(TxLock::weight(), amount);
@@ -394,7 +391,7 @@ impl Request {
                         .release_swap_lock()
                         .await
                         .expect("Could not release swap lock");
-                }.instrument(tracing_span));
+                }.instrument(Span::current()));
 
                 Ok(json!({
                     "swapId": swap_id.to_string(),
@@ -402,7 +399,6 @@ impl Request {
             }
             Method::Resume { swap_id } => {
                 context.swap_lock.acquire_swap_lock(swap_id).await?;
-                let tracing_span_clone = tracing_span.clone();
 
                 tokio::spawn(async move {
                     tokio::select! {
@@ -449,7 +445,7 @@ impl Request {
 
                              let (event_loop, event_loop_handle) =
                                  EventLoop::new(swap_id, swarm, seller_peer_id)?;
-                             let handle = tokio::spawn(event_loop.run().instrument(tracing_span_clone));
+                             let handle = tokio::spawn(event_loop.run().instrument(Span::current()));
 
                              let monero_receive_address = context.db.get_monero_address(swap_id).await?;
                              let swap = Swap::from_db(
@@ -495,7 +491,7 @@ impl Request {
                         .release_swap_lock()
                         .await
                         .expect("Could not release swap lock");
-                }.instrument(tracing_span));
+                }.instrument(Span::current()));
                 Ok(json!({
                     "result": "ok",
                 }))
@@ -725,9 +721,9 @@ impl Request {
     }
 
     pub async fn call(self, context: Arc<Context>) -> Result<serde_json::Value> {
-        let method_span = self.cmd.get_tracing_span(self.log_reference.clone());
+        let method_span = self.cmd.get_tracing_span(self.log_reference.clone()).clone();
 
-        self.handle_cmd(context, method_span.clone())
+        self.handle_cmd(context)
             .instrument(method_span)
             .await
     }
diff --git a/swap/src/bitcoin/wallet.rs b/swap/src/bitcoin/wallet.rs
index 6aed30da..c1f8565c 100644
--- a/swap/src/bitcoin/wallet.rs
+++ b/swap/src/bitcoin/wallet.rs
@@ -24,6 +24,7 @@ use std::path::Path;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use tokio::sync::{watch, Mutex};
+use tracing::{Instrument, Span};
 
 const SLED_TREE_NAME: &str = "default_tree";
 
@@ -192,7 +193,7 @@ impl Wallet {
 
                         tokio::time::sleep(Duration::from_secs(5)).await;
                     }
-                });
+                }.instrument(Span::current()));
 
                 Subscription {
                     receiver,