diff --git a/rust/connlib/tunnel/src/device_channel.rs b/rust/connlib/tunnel/src/device_channel.rs index e04d838b1..68bb507e3 100644 --- a/rust/connlib/tunnel/src/device_channel.rs +++ b/rust/connlib/tunnel/src/device_channel.rs @@ -135,7 +135,7 @@ impl Device { ) })?; - tracing::trace!(target: "wire", from = "device", dst = %packet.destination(), src = %packet.source(), bytes = %packet.packet().len()); + tracing::trace!(target: "wire::dev::recv", dst = %packet.destination(), src = %packet.source(), bytes = %packet.packet().len()); Poll::Ready(Ok(packet)) } @@ -169,7 +169,7 @@ impl Device { ) })?; - tracing::trace!(target: "wire", from = "device", dst = %packet.destination(), src = %packet.source(), bytes = %packet.packet().len()); + tracing::trace!(target: "wire::dev::recv", dst = %packet.destination(), src = %packet.source(), bytes = %packet.packet().len()); Poll::Ready(Ok(packet)) } @@ -191,7 +191,7 @@ impl Device { } pub fn write(&self, packet: IpPacket<'_>) -> io::Result { - tracing::trace!(target: "wire", to = "device", dst = %packet.destination(), src = %packet.source(), bytes = %packet.packet().len()); + tracing::trace!(target: "wire::dev::send", dst = %packet.destination(), src = %packet.source(), bytes = %packet.packet().len()); match packet { IpPacket::Ipv4(msg) => self.tun()?.write4(msg.packet()), diff --git a/rust/connlib/tunnel/src/sockets.rs b/rust/connlib/tunnel/src/sockets.rs index 4837ab4d4..7f1441ae2 100644 --- a/rust/connlib/tunnel/src/sockets.rs +++ b/rust/connlib/tunnel/src/sockets.rs @@ -283,7 +283,7 @@ impl Socket { packet, }) .inspect(|r| { - tracing::trace!(target: "wire", from = "network", src = %r.from, dst = %r.local, num_bytes = %r.packet.len()); + tracing::trace!(target: "wire::net::recv", src = %r.from, dst = %r.local, num_bytes = %r.packet.len()); }); return Poll::Ready(Ok(iter)); @@ -322,7 +322,7 @@ impl Socket { } fn send(&mut self, transmit: quinn_udp::Transmit) { - tracing::trace!(target: "wire", to = "network", src = ?transmit.src_ip, dst = %transmit.destination, num_bytes = %transmit.contents.len()); + tracing::trace!(target: "wire::net::send", src = ?transmit.src_ip, dst = %transmit.destination, num_bytes = %transmit.contents.len()); self.buffered_transmits.push(transmit); diff --git a/rust/phoenix-channel/src/lib.rs b/rust/phoenix-channel/src/lib.rs index 7cc60e7cd..80d5ea9f2 100644 --- a/rust/phoenix-channel/src/lib.rs +++ b/rust/phoenix-channel/src/lib.rs @@ -321,7 +321,7 @@ where if let Some(message) = self.pending_messages.pop_front() { match stream.start_send_unpin(Message::Text(message.clone())) { Ok(()) => { - tracing::trace!(target: "wire", to="portal", %message); + tracing::trace!(target: "wire::api::send", %message); match stream.poll_flush_unpin(cx) { Poll::Ready(Ok(())) => { @@ -359,7 +359,7 @@ where continue; }; - tracing::trace!(target: "wire", from="portal", %message); + tracing::trace!(target: "wire::api::recv", %message); let message = match serde_json::from_str::< PhoenixMessage,