From 03280cd9b4e354f21ec32d9bc6eb7bd88cd97b2d Mon Sep 17 00:00:00 2001
From: Floriane TUERNAL SABOTINOV <ftuertinov@proton.me>
Date: Tue, 2 Sep 2025 15:25:08 +0200
Subject: [PATCH] Revert "auth and gateway changes"

This reverts commit 7609d6ae4d46333e6488cf13b0262b5489c2a207.
---
 .../connection_handler/authenticated.rs       |  2 +-
 .../websocket/connection_handler/fresh.rs     |  1 -
 nym-node/src/cli/commands/run/mod.rs          |  3 +-
 nym-node/src/node/mod.rs                      | 33 +------------------
 4 files changed, 3 insertions(+), 36 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 e4c3c51117..d873a949a7 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
@@ -306,7 +306,7 @@ impl<R, S> AuthenticatedHandler<R, S> {
     /// # Arguments
     ///
     /// * `bin_msg`: raw message to handle.
-    #[instrument(skip_all)]
+    // #[instrument(skip_all)]
     async fn handle_binary(&mut self, bin_msg: Vec<u8>) -> Message {
         trace!("binary request");
         // this function decrypts the request and checks the MAC
diff --git a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
index 450376bffd..f883e578d1 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
@@ -1118,7 +1118,6 @@ impl<R, S> FreshHandler<R, S> {
             .map_err(|_| InitialAuthenticationError::InvalidRequest)
     }
 
-    #[instrument(skip_all)]
     pub(crate) async fn start_handling(self)
     where
         S: AsyncRead + AsyncWrite + Unpin + Send,
diff --git a/nym-node/src/cli/commands/run/mod.rs b/nym-node/src/cli/commands/run/mod.rs
index 3112e9c9c6..703e47662b 100644
--- a/nym-node/src/cli/commands/run/mod.rs
+++ b/nym-node/src/cli/commands/run/mod.rs
@@ -8,7 +8,7 @@ use crate::node::mixnet::packet_forwarding::global::is_global_ip;
 use crate::node::NymNode;
 use std::fs;
 use std::net::IpAddr;
-use tracing::{debug, info, instrument, trace, warn};
+use tracing::{debug, info, trace, warn};
 
 mod args;
 
@@ -37,7 +37,6 @@ fn check_public_ips(ips: &[IpAddr], local: bool) -> Result<(), NymNodeError> {
     Ok(())
 }
 
-#[instrument(skip_all)]
 pub(crate) async fn execute(mut args: Args) -> Result<(), NymNodeError> {
     trace!("passed arguments: {args:#?}");
 
diff --git a/nym-node/src/node/mod.rs b/nym-node/src/node/mod.rs
index e345ba3b64..c240686b8a 100644
--- a/nym-node/src/node/mod.rs
+++ b/nym-node/src/node/mod.rs
@@ -66,7 +66,7 @@ use std::ops::Deref;
 use std::path::Path;
 use std::sync::Arc;
 use tokio::sync::mpsc;
-use tracing::{debug, info, instrument, trace};
+use tracing::{debug, info, trace};
 use zeroize::Zeroizing;
 
 pub mod bonding_information;
@@ -599,12 +599,6 @@ impl NymNode {
         })
     }
 
-    #[instrument(skip_all, 
-        name = "gateway_tasks_orchestrator"
-        fields(
-            node_id = %self.ed25519_identity_key().to_base58_string(),
-        )
-    )]
     async fn start_gateway_tasks(
         &mut self,
         cached_network: CachedNetwork,
@@ -634,12 +628,6 @@ impl NymNode {
 
         // if we're running in entry mode, start the websocket
         if self.modes().entry {
-            // Create websocket span 
-            let ws_span = tracing::info_span!(
-                "websocket_service",
-                node_id = %self.ed25519_identity_key().to_base58_string(),
-            );
-            let _ws_guard = ws_span.enter();
             info!(
                 "starting the clients websocket... on {}",
                 self.config.gateway_tasks.ws_bind_address
@@ -655,12 +643,6 @@ impl NymNode {
         // if we're running in exit mode, start the IPR and NR
         if self.modes().exit {
             info!("starting the exit service providers: NR + IPR");
-            // Create exit service providers span
-            let exit_span = tracing::info_span!(
-                "exit_service_providers",
-                node_id = %self.ed25519_identity_key().to_base58_string(),
-            );
-            let _exit_guard = exit_span.enter();
             gateway_tasks_builder.set_network_requester_opts(config.nr_opts);
             gateway_tasks_builder.set_ip_packet_router_opts(config.ipr_opts);
 
@@ -1138,12 +1120,6 @@ impl NymNode {
         Ok(())
     }
 
-    #[instrument(skip_all, 
-        name = "nym_node_orchestrator"
-        fields(
-            node_id = %self.ed25519_identity_key().to_base58_string(),
-        )
-    )]
     async fn start_nym_node_tasks(mut self) -> Result<ShutdownManager, NymNodeError> {
         info!("starting Nym Node {} with the following modes: mixnode: {}, entry: {}, exit: {}, wireguard: {}",
             self.ed25519_identity_key(),
@@ -1154,13 +1130,6 @@ impl NymNode {
         );
         debug!("config: {:#?}", self.config);
 
-        // create http server span
-        let server_span = tracing::info_span!(
-            "http_server",
-            bind_address = %self.config.http.bind_address
-        );
-        let _server_guard = server_span.enter();
-
         let http_server = self.build_http_server().await?;
         let bind_address = self.config.http.bind_address;
         let server_shutdown = self.shutdown_manager.clone_token("http-server");