Merge branch 'dev'

src/ic-websocket-gateway/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ic_websocket_gateway"
-version = "1.3.0"
+version = "1.3.1"
 edition.workspace = true
 rust-version.workspace = true
 repository.workspace = true

src/ic-websocket-gateway/src/client_session_handler.rs

@@ -13,7 +13,7 @@ use tokio::{
     sync::mpsc::{self, Receiver, Sender},
 };
 use tokio_tungstenite::accept_async;
-use tracing::{debug, info, span, warn, Instrument, Level, Span};
+use tracing::{debug, field, info, span, warn, Instrument, Level, Span};
 
 /// Handler of a client IC WS session
 pub struct ClientSessionHandler {
@@ -63,8 +63,7 @@ impl ClientSessionHandler {
                     Receiver<IcWsCanisterMessage>,
                 ) = mpsc::channel(100);
 
-                let client_session_span =
-                    span!(parent: &Span::current(), Level::TRACE, "Client Session");
+                let client_session_span = span!(parent: &Span::current(), Level::TRACE, "Client Session", canister_id = field::Empty);
 
                 let client_session = ClientSession::init(
                     self.id,
@@ -142,6 +141,8 @@ impl ClientSessionHandler {
                             client_session_span.clone(),
                         );
 
+                    client_session_span.record("canister_id", canister_id.to_string());
+
                     // TODO: figure out if it is guaranteed that all threads see the updated state of the gateway
                     //       before relaying the message to the IC
                     client_session

src/ic-websocket-gateway/src/ws_listener.rs

@@ -145,7 +145,7 @@ impl WsListener {
         let accept_client_connection_span = span!(
             Level::DEBUG,
             "Accept Connection",
-            ?client_addr,
+            client_addr = ?client_addr.ip(),
             client_id = self.next_client_id
         );
         let client_id = self.next_client_id;