From 8aa5e61ba61ef04ca1d349b5380c7cb6283f8477 Mon Sep 17 00:00:00 2001
From: Floriane TUERNAL SABOTINOV <ftuertinov@proton.me>
Date: Mon, 27 Oct 2025 19:11:13 +0100
Subject: [PATCH] wip

---
 .../websocket/connection_handler/authenticated.rs      | 10 ++++++----
 nym-gateway-probe/Cargo.toml                           |  4 ++++
 nym-gateway-probe/src/icmp.rs                          |  1 +
 nym-node/src/node/mixnet/handler.rs                    |  6 +++---
 sdk/rust/nym-sdk/Cargo.toml                            |  1 +
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
index 4bde8878d0..e0ad6d8879 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
@@ -383,9 +383,11 @@ impl<R, S> AuthenticatedHandler<R, S> {
             Ok(request) => match request {
                 // currently only a single type exists
                 BinaryRequest::ForwardSphinx { packet }
-                | BinaryRequest::ForwardSphinxV2 { packet } => {
-                    self.handle_forward_sphinx(packet).in_current_span().await.into_ws_message()
-                }
+                | BinaryRequest::ForwardSphinxV2 { packet } => self
+                    .handle_forward_sphinx(packet)
+                    .in_current_span()
+                    .await
+                    .into_ws_message(),
                 _ => RequestHandlingError::UnknownBinaryRequest.into_error_message(),
             },
         }
@@ -682,7 +684,7 @@ impl<R, S> AuthenticatedHandler<R, S> {
         loop {
             tokio::select! {
                 // Received a request to ping the client to check if it's still active
-                tx = self.is_active_request_receiver.next() => {
+                tx = self.is_active_request_receiver.next().in_current_span() => {
                     match tx {
                         None => break,
                         Some(reply_tx) => {
diff --git a/nym-gateway-probe/Cargo.toml b/nym-gateway-probe/Cargo.toml
index 74f547ee53..4a1893b350 100644
--- a/nym-gateway-probe/Cargo.toml
+++ b/nym-gateway-probe/Cargo.toml
@@ -73,3 +73,7 @@ vergen-gitcl = { workspace = true, default-features = false, features = [
 
 [package.metadata.cargo-machete]
 ignored = ["vergen", "nym-http-api-client"]
+
+[features]
+default = []
+otel = ["nym-sdk/otel", "nym-http-api-client/otel", "nym-bin-common/otel"]
\ No newline at end of file
diff --git a/nym-gateway-probe/src/icmp.rs b/nym-gateway-probe/src/icmp.rs
index bce37170d0..839fe7ae6a 100644
--- a/nym-gateway-probe/src/icmp.rs
+++ b/nym-gateway-probe/src/icmp.rs
@@ -84,6 +84,7 @@ fn create_input_message(
         surbs,
         lane,
         packet_type,
+        #[cfg(feature = "otel")]
         None
     ))
 }
diff --git a/nym-node/src/node/mixnet/handler.rs b/nym-node/src/node/mixnet/handler.rs
index 28e776d6cc..3a3dad1f66 100644
--- a/nym-node/src/node/mixnet/handler.rs
+++ b/nym-node/src/node/mixnet/handler.rs
@@ -20,7 +20,7 @@ use std::net::SocketAddr;
 use tokio::net::TcpStream;
 use tokio::time::Instant;
 use tokio_util::codec::Framed;
-use tracing::{debug, error, instrument, trace, warn};
+use tracing::{debug, error, instrument, Instrument, trace, warn};
 
 struct PendingReplayCheckPackets {
     // map of rotation id used for packet creation to the packets
@@ -497,9 +497,9 @@ impl ConnectionHandler {
                     trace!("connection handler: received shutdown");
                     break
                 }
-                maybe_framed_nym_packet = mixnet_connection.next() => {
+                maybe_framed_nym_packet = mixnet_connection.next().in_current_span() => {
                     match maybe_framed_nym_packet {
-                        Some(Ok(packet)) => self.handle_received_nym_packet(packet).await,
+                        Some(Ok(packet)) => self.handle_received_nym_packet(packet).in_current_span().await,
                         Some(Err(err)) => {
                             debug!("connection got corrupted with: {err}");
                             return
diff --git a/sdk/rust/nym-sdk/Cargo.toml b/sdk/rust/nym-sdk/Cargo.toml
index 6e668d7de4..126e7e722b 100644
--- a/sdk/rust/nym-sdk/Cargo.toml
+++ b/sdk/rust/nym-sdk/Cargo.toml
@@ -105,6 +105,7 @@ otel = [
     "nym-bin-common/otel",
     "nym-gateway-requests/otel",
     "nym-socks5-client-core/otel",
+    "nym-client-core/otel",
     "opentelemetry",
     "opentelemetry_sdk",
     "opentelemetry-otlp",