From f34f596d8d3dd3590b3ad46e4e5dfad70fea47a1 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Fri, 15 Nov 2024 16:11:03 +0000
Subject: [PATCH] chore(connlib): print GRO metadata in `wire::net::recv` log
 (#7353)

Previously, we printed only the size of each individual packet in the
`wire::net` logs. This makes it impossible to tell whether or not GRO
was used to receive this packet. The total number of bytes can still be
computed by calculating `num_packets * segment_size + trailing_bytes`.
Thus, the new log is strictly superior.
---
 rust/socket-factory/src/lib.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/rust/socket-factory/src/lib.rs b/rust/socket-factory/src/lib.rs
index 8ccefe116..21d7e5eb1 100644
--- a/rust/socket-factory/src/lib.rs
+++ b/rust/socket-factory/src/lib.rs
@@ -237,12 +237,7 @@ impl UdpSocket {
                 };
 
                 match meta.stride.cmp(&meta.len) {
-                    std::cmp::Ordering::Equal => {}
-                    std::cmp::Ordering::Less => {
-                        let num_packets = meta.len / meta.stride;
-
-                        tracing::trace!(%num_packets, size = %meta.stride, "Read packets using GRO");
-                    }
+                    std::cmp::Ordering::Equal | std::cmp::Ordering::Less => {}
                     std::cmp::Ordering::Greater => {
                         return Poll::Ready(Err(io::Error::new(
                             io::ErrorKind::InvalidData,
@@ -256,15 +251,18 @@ impl UdpSocket {
 
                 let local = SocketAddr::new(local_ip, *port);
 
+                let segment_size = meta.stride;
+                let num_packets = meta.len / segment_size;
+                let trailing_bytes = meta.len % segment_size;
+
+                tracing::trace!(target: "wire::net::recv", src = %meta.addr, dst = %local, %num_packets, %segment_size, %trailing_bytes);
+
                 let iter = buffer[..meta.len]
                     .chunks(meta.stride)
                     .map(move |packet| DatagramIn {
                         local,
                         from: meta.addr,
                         packet,
-                    })
-                    .inspect(|r| {
-                        tracing::trace!(target: "wire::net::recv", src = %r.from, dst = %r.local, num_bytes = %r.packet.len());
                     });
 
                 return Poll::Ready(Ok(iter));