Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-12-01 13:04:48 -05:00
Code Issues Projects Releases Packages Wiki Activity

use Span::current() to pass down to tracing span to spawned tasks

Browse source
This commit is contained in:
binarybaron 2023-08-24 18:17:41 +02:00
parent 86ac0579f0
commit 011dd3441d
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
swap/src/api/request.rs
View file

@ -177,7 +177,6 @@ impl Request {
async fn handle_cmd(
self,
context: Arc<Context>,
tracing_span: Span,
) -> Result<serde_json::Value> {
match self.cmd {
Method::SuspendCurrentSwap => {
@ -263,8 +262,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;
@ -309,7 +306,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);
@ -392,7 +389,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(),
@ -400,7 +397,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! {
@ -447,7 +443,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(
@ -493,7 +489,7 @@ impl Request {
.release_swap_lock()
.await
.expect("Could not release swap lock");
}.instrument(tracing_span));
}.instrument(Span::current()));
Ok(json!({
"result": "ok",
}))
@ -723,9 +719,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
}

3
swap/src/bitcoin/wallet.rs
View file

@ -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,