Add tracing and spans

Author: dcompoze

Cargo.lock

@@ -38,5 +38,6 @@ log = { version = "0.4.27" }
 num = "0.4.3"
 rand = "0.8.0"
 tokio = { version = "1.43.0", features = ["full"] }
+tracing = "0.1.41"
 
 mantis-sdk = { path = "mantis-sdk" }

Cargo.toml

@@ -27,11 +27,10 @@ alloy = { workspace = true }
 anyhow = { workspace = true }
 base64 = { workspace = true }
 chrono = { workspace = true }
-env_logger = { workspace = true }
-log = { workspace = true }
 num = { workspace = true }
 rand = { workspace = true }
 tokio = { workspace = true }
+tracing = { workspace = true }
 
 [lints.clippy]
 obfuscated_if_else = "allow"

mantis-sdk/Cargo.toml

@@ -6,7 +6,7 @@ use alloy::sol;
 use alloy::transports::Transport;
 use anyhow::{anyhow, Result};
 use chrono::Utc;
-use log::info;
+use tracing::{info, instrument, span, Level};
 use Escrow::NewIntent;
 
 use crate::{random_intent_id, retry};
@@ -34,6 +34,7 @@ pub struct GasFees {
     pub max_priority_fee_per_gas: u128,
 }
 
+#[instrument(skip_all)]
 pub async fn escrow_funds<P, T>(
     provider: P,
     escrow_address: Address,
@@ -90,6 +91,7 @@ where
                 .await
         },
         3,
+        Some(span!(Level::INFO, "escrowFunds")),
     )
     .await?;
 
@@ -108,12 +110,14 @@ where
                 .ok_or(anyhow!("No transaction receipt"))
         },
         5,
+        Some(span!(Level::INFO, "get_transaction_receipt")),
     )
     .await?;
 
     Ok(receipt)
 }
 
+#[instrument(skip_all)]
 pub async fn solve_intent_remote<P, T>(
     provider: P,
     escrow_address: Address,
@@ -139,6 +143,7 @@ where
                 .await
         },
         3,
+        Some(span!(Level::INFO, "solveIntentRemote")),
     )
     .await?;
 
@@ -157,12 +162,14 @@ where
                 .ok_or(anyhow!("No transaction receipt"))
         },
         5,
+        Some(span!(Level::INFO, "get_transaction_receipt")),
     )
     .await?;
 
     Ok(receipt)
 }
 
+#[instrument(skip_all)]
 pub async fn solve_intent_local<P, T>(
     provider: P,
     escrow_address: Address,
@@ -184,6 +191,7 @@ where
                 .await
         },
         3,
+        Some(span!(Level::INFO, "solveIntentLocal")),
     )
     .await?;
 
@@ -202,12 +210,14 @@ where
                 .ok_or(anyhow!("No transaction receipt"))
         },
         5,
+        Some(span!(Level::INFO, "get_transaction_receipt")),
     )
     .await?;
 
     Ok(receipt)
 }
 
+#[instrument(skip_all)]
 pub async fn cancel_intent<P, T>(
     provider: P,
     escrow_address: Address,
@@ -219,7 +229,12 @@ where
 {
     let contract = Escrow::new(escrow_address, provider.clone());
 
-    let pending = retry(|| async { contract.cancelIntent(intent_id).send().await }, 3).await?;
+    let pending = retry(
+        || async { contract.cancelIntent(intent_id).send().await },
+        3,
+        Some(span!(Level::INFO, "cancelIntent")),
+    )
+    .await?;
 
     let tx_hash = pending.tx_hash();
 
@@ -236,13 +251,15 @@ where
                 .ok_or(anyhow!("No transaction receipt"))
         },
         5,
+        Some(span!(Level::INFO, "get_transaction_receipt")),
     )
     .await?;
 
     info!("Canceled intent {} on Ethereum", intent_id);
     Ok(receipt)
 }
 
+#[instrument(skip_all)]
 pub async fn approve_erc20<P, T>(
     provider: P,
     token: Address,
@@ -258,6 +275,7 @@ where
     let pending = retry(
         || async { token_contract.approve(spender, amount).send().await },
         3,
+        Some(span!(Level::INFO, "approve")),
     )
     .await?;
 
@@ -273,12 +291,14 @@ where
                 .ok_or(anyhow!("No transaction receipt"))
         },
         5,
+        Some(span!(Level::INFO, "get_transaction_receipt")),
     )
     .await?;
 
     Ok(receipt)
 }
 
+#[instrument(skip_all)]
 pub async fn send_raw_tx<P, T>(
     provider: P,
     to: Address,
@@ -308,7 +328,12 @@ where
         ..Default::default()
     };
 
-    let pending = retry(|| provider.send_transaction(transaction.clone()), 3).await?;
+    let pending = retry(
+        || provider.send_transaction(transaction.clone()),
+        3,
+        Some(span!(Level::INFO, "send_transaction")),
+    )
+    .await?;
     let tx_hash = pending.tx_hash();
 
     info!("Ethereum transaction {} was sent to the network", tx_hash);
@@ -321,6 +346,7 @@ where
                 .ok_or(anyhow!("No transaction receipt"))
         },
         5,
+        Some(span!(Level::INFO, "get_transaction_receipt")),
     )
     .await?;
 

mantis-sdk/src/ethereum.rs

@@ -2,20 +2,21 @@ use std::fmt::Display;
 use std::future::Future;
 use std::time::Duration;
 
-use log::{error, warn};
 use rand::Rng;
 use tokio::time::sleep;
+use tracing::{error, warn, Span};
 
 pub mod auction;
 pub mod ethereum;
 pub mod solana;
 
-pub async fn retry<F, Fut, T, E>(mut function: F, max_tries: u32) -> Result<T, E>
+pub async fn retry<F, Fut, T, E>(mut function: F, max_tries: u32, span: Option<Span>) -> Result<T, E>
 where
     F: FnMut() -> Fut,
     Fut: Future<Output = Result<T, E>>,
     E: Display,
 {
+    let _enter = span.as_ref().map(|s| s.enter());
     let mut count = 0;
     loop {
         count += 1;