diff --git a/bpf/go_common.h b/bpf/go_common.h
index 5a98ae665..12ebd57b7 100644
--- a/bpf/go_common.h
+++ b/bpf/go_common.h
@@ -228,7 +228,7 @@ static __always_inline void read_ip_and_port(u8 *dst_ip, u16 *dst_port, void *sr
     }
 }
 
-static __always_inline void get_conn_info_from_fd(void *fd_ptr, connection_info_t *info) {
+static __always_inline u8 get_conn_info_from_fd(void *fd_ptr, connection_info_t *info) {
     if (fd_ptr) {
         void *laddr_ptr = 0;
         void *raddr_ptr = 0;
@@ -251,20 +251,26 @@ static __always_inline void get_conn_info_from_fd(void *fd_ptr, connection_info_
             // in Go we keep the original connection info order, since we only need it
             // sorted when we make server requests or when we populate the trace_map for
             // black box context propagation.
+
+            return 1;
         }
     }
+
+    return 0;
 }
 
 // HTTP black-box context propagation
-static __always_inline void get_conn_info(void *conn_ptr, connection_info_t *info) {
+static __always_inline u8 get_conn_info(void *conn_ptr, connection_info_t *info) {
     if (conn_ptr) {
         void *fd_ptr = 0;
         bpf_probe_read(&fd_ptr, sizeof(fd_ptr), (void *)(conn_ptr + conn_fd_pos)); // find fd
 
         bpf_dbg_printk("Found fd ptr %llx", fd_ptr);
 
-        get_conn_info_from_fd(fd_ptr, info);
+        return get_conn_info_from_fd(fd_ptr, info);
     }
+
+    return 0;
 }
 
 #endif // GO_COMMON_H
diff --git a/bpf/go_grpc.c b/bpf/go_grpc.c
index ce2ea3e74..63b928833 100644
--- a/bpf/go_grpc.c
+++ b/bpf/go_grpc.c
@@ -188,8 +188,7 @@ int uprobe_server_handleStream_return(struct pt_regs *ctx) {
             bpf_probe_read(&conn_conn_ptr, sizeof(conn_conn_ptr), conn_ptr + 8);
             bpf_dbg_printk("conn_conn_ptr %llx", conn_conn_ptr);
             if (conn_conn_ptr) {                
-                get_conn_info(conn_conn_ptr, &trace->conn);
-                found_conn = 1;
+                found_conn = get_conn_info(conn_conn_ptr, &trace->conn);
             }
         } 
     }
@@ -431,8 +430,10 @@ int uprobe_transport_http2Client_NewStream(struct pt_regs *ctx) {
             bpf_dbg_printk("conn_conn_ptr %llx", conn_conn_ptr);
             if (conn_conn_ptr) {                
                 connection_info_t conn = {0};
-                get_conn_info(conn_conn_ptr, &conn);
-                bpf_map_update_elem(&ongoing_client_connections, &goroutine_addr, &conn, BPF_ANY);
+                u8 ok = get_conn_info(conn_conn_ptr, &conn);
+                if (ok) {
+                    bpf_map_update_elem(&ongoing_client_connections, &goroutine_addr, &conn, BPF_ANY);
+                }
             }
         } 
 
diff --git a/bpf/go_kafka_go.c b/bpf/go_kafka_go.c
index f4d7a5391..c0aebadf2 100644
--- a/bpf/go_kafka_go.c
+++ b/bpf/go_kafka_go.c
@@ -191,7 +191,10 @@ int uprobe_protocol_roundtrip_ret(struct pt_regs *ctx) {
                 bpf_probe_read(&conn_ptr, sizeof(conn_ptr), (void *)(p_ptr->conn_ptr + 8)); // find conn
                 bpf_dbg_printk("conn ptr %llx", conn_ptr);
                 if (conn_ptr) {
-                    get_conn_info(conn_ptr, &trace->conn);
+                    u8 ok = get_conn_info(conn_ptr, &trace->conn);
+                    if (!ok) {
+                        __builtin_memset(&trace->conn, 0, sizeof(connection_info_t));
+                    }
                 }
 
                 __builtin_memcpy(trace->topic, topic_ptr->name, MAX_TOPIC_NAME_LEN);
@@ -237,7 +240,10 @@ int uprobe_reader_read(struct pt_regs *ctx) {
             bpf_probe_read(&conn_ptr, sizeof(conn_ptr), (void *)(conn + 8)); // find conn
             bpf_dbg_printk("conn ptr %llx", conn_ptr);
             if (conn_ptr) {
-                get_conn_info(conn_ptr, &r.conn);
+                u8 ok = get_conn_info(conn_ptr, &r.conn);
+                if (!ok) {
+                    __builtin_memset(&r.conn, 0, sizeof(connection_info_t));
+                }
             }
         }
 
diff --git a/bpf/go_nethttp.c b/bpf/go_nethttp.c
index fb6524c55..90bf1a1fe 100644
--- a/bpf/go_nethttp.c
+++ b/bpf/go_nethttp.c
@@ -233,8 +233,7 @@ int uprobe_ServeHTTPReturns(struct pt_regs *ctx) {
                 bpf_probe_read(&conn_conn_conn_ptr, sizeof(conn_conn_conn_ptr), conn_conn_ptr + 8);
                 bpf_dbg_printk("conn_conn_conn_ptr %llx", conn_conn_conn_ptr);
 
-                get_conn_info(conn_conn_conn_ptr, &trace->conn);
-                found_conn = 1;
+                found_conn = get_conn_info(conn_conn_conn_ptr, &trace->conn);
             }
         } 
 
@@ -263,9 +262,10 @@ int uprobe_ServeHTTPReturns(struct pt_regs *ctx) {
                     void *conn_ptr = 0;
                     bpf_probe_read(&conn_ptr, sizeof(conn_ptr), (void *)(rwc_ptr + rwc_conn_pos)); // find conn
                     if (conn_ptr) {
-                        get_conn_info(conn_ptr, &trace->conn);
-                        found = 1;
-                        bpf_dbg_printk("found backup connection info");
+                        found = get_conn_info(conn_ptr, &trace->conn);
+                        if (found) {
+                            bpf_dbg_printk("found backup connection info");
+                        }
                         //dbg_print_http_connection_info(&conn);
                     }
                 }
@@ -562,12 +562,14 @@ int uprobe_http2RoundTrip(struct pt_regs *ctx) {
             bpf_dbg_printk("tconn_conn %llx", tconn_conn);
 
             connection_info_t conn = {0};
-            get_conn_info(tconn_conn, &conn);
+            u8 ok = get_conn_info(tconn_conn, &conn);
 
-            void *goroutine_addr = GOROUTINE_PTR(ctx);
-            bpf_dbg_printk("goroutine_addr %lx", goroutine_addr);    
+            if (ok) {
+                void *goroutine_addr = GOROUTINE_PTR(ctx);
+                bpf_dbg_printk("goroutine_addr %lx", goroutine_addr);    
 
-            bpf_map_update_elem(&ongoing_client_connections, &goroutine_addr, &conn, BPF_ANY);
+                bpf_map_update_elem(&ongoing_client_connections, &goroutine_addr, &conn, BPF_ANY);
+            }
         }
 
 #ifndef NO_HEADER_PROPAGATION
@@ -775,7 +777,7 @@ int uprobe_netFdRead(struct pt_regs *ctx) {
         bpf_dbg_printk("Found existing server connection, parsing FD information for socket tuples, %llx", goroutine_addr);
 
         void *fd_ptr = GO_PARAM1(ctx);
-        get_conn_info_from_fd(fd_ptr, conn);
+        get_conn_info_from_fd(fd_ptr, conn); // ok to not check the result, we leave it as 0
 
         //dbg_print_http_connection_info(conn);
     }
@@ -813,7 +815,7 @@ int uprobe_persistConnRoundTrip(struct pt_regs *ctx) {
             bpf_probe_read(&conn_ptr, sizeof(conn_ptr), (void *)(conn_conn_ptr + rwc_conn_pos)); // find conn
             if (conn_ptr) {
                 connection_info_t conn = {0};
-                get_conn_info(conn_ptr, &conn);
+                get_conn_info(conn_ptr, &conn); // initialized to 0, no need to check the result if we succeeded
                 u64 pid_tid = bpf_get_current_pid_tgid();
                 u32 pid = pid_from_pid_tgid(pid_tid);
                 tp_info_pid_t tp_p = {
diff --git a/bpf/go_redis.c b/bpf/go_redis.c
index aa9f52b88..a9b140935 100644
--- a/bpf/go_redis.c
+++ b/bpf/go_redis.c
@@ -115,7 +115,10 @@ int uprobe_redis_with_writer(struct pt_regs *ctx) {
                 bpf_probe_read(&conn_ptr, sizeof(conn_ptr), (void *)(tcp_conn_ptr + 8)); // find conn
                 bpf_dbg_printk("conn ptr %llx", conn_ptr);
                 if (conn_ptr) {
-                    get_conn_info(conn_ptr, &req->conn);
+                    u8 ok = get_conn_info(conn_ptr, &req->conn);
+                    if (!ok) {
+                        __builtin_memset(&req->conn, 0, sizeof(connection_info_t));
+                    }
                 }
             }
         }
diff --git a/bpf/go_sarama.c b/bpf/go_sarama.c
index 9dab2dfd3..d7fecd72f 100644
--- a/bpf/go_sarama.c
+++ b/bpf/go_sarama.c
@@ -101,7 +101,10 @@ int uprobe_sarama_broker_write(struct pt_regs *ctx) {
                     bpf_probe_read(&conn_ptr, sizeof(conn_ptr), (void *)(tcp_conn_ptr + 8)); // find conn
                     bpf_dbg_printk("conn ptr %llx", conn_ptr);
                     if (conn_ptr) {
-                        get_conn_info(conn_ptr, &req.conn);
+                        u8 ok = get_conn_info(conn_ptr, &req.conn);
+                        if (!ok) {
+                            __builtin_memset(&req.conn, 0, sizeof(connection_info_t));
+                        }
                     }
                 }
             }
diff --git a/pkg/internal/ebpf/common/common.go b/pkg/internal/ebpf/common/common.go
index 3bedc6abd..cf2ccf370 100644
--- a/pkg/internal/ebpf/common/common.go
+++ b/pkg/internal/ebpf/common/common.go
@@ -6,6 +6,7 @@ import (
 	"encoding/binary"
 	"io"
 	"log/slog"
+	"net"
 	"os"
 	"strings"
 	"time"
@@ -228,3 +229,23 @@ func cstr(chars []uint8) string {
 
 	return string(chars[:addrLen])
 }
+
+func (connInfo *BPFConnInfo) reqHostInfo() (source, target string) {
+	src := make(net.IP, net.IPv6len)
+	dst := make(net.IP, net.IPv6len)
+	copy(src, connInfo.S_addr[:])
+	copy(dst, connInfo.D_addr[:])
+
+	srcStr := src.String()
+	dstStr := dst.String()
+
+	if src.IsUnspecified() {
+		srcStr = ""
+	}
+
+	if dst.IsUnspecified() {
+		dstStr = ""
+	}
+
+	return srcStr, dstStr
+}
diff --git a/pkg/internal/ebpf/common/http2grpc_transform.go b/pkg/internal/ebpf/common/http2grpc_transform.go
index 5613a8db6..0115b7dc9 100644
--- a/pkg/internal/ebpf/common/http2grpc_transform.go
+++ b/pkg/internal/ebpf/common/http2grpc_transform.go
@@ -3,9 +3,9 @@ package ebpfcommon
 import (
 	"bytes"
 	"encoding/binary"
-	"net"
 	"strconv"
 	"strings"
+	"unsafe"
 
 	"github.com/cilium/ebpf/ringbuf"
 	lru "github.com/hashicorp/golang-lru/v2"
@@ -260,15 +260,6 @@ func (event *BPFHTTP2Info) eventType(protocol Protocol) request.EventType {
 	return 0
 }
 
-func (event *BPFHTTP2Info) hostInfo() (source, target string) {
-	src := make(net.IP, net.IPv6len)
-	dst := make(net.IP, net.IPv6len)
-	copy(src, event.ConnInfo.S_addr[:])
-	copy(dst, event.ConnInfo.D_addr[:])
-
-	return src.String(), dst.String()
-}
-
 // nolint:cyclop
 func http2FromBuffers(event *BPFHTTP2Info) (request.Span, bool, error) {
 	bLen := len(event.Data)
@@ -333,7 +324,7 @@ func http2FromBuffers(event *BPFHTTP2Info) (request.Span, bool, error) {
 			peer := ""
 			host := ""
 			if event.ConnInfo.S_port != 0 || event.ConnInfo.D_port != 0 {
-				source, target := event.hostInfo()
+				source, target := (*BPFConnInfo)(unsafe.Pointer(&event.ConnInfo)).reqHostInfo()
 				host = target
 				peer = source
 			}
diff --git a/pkg/internal/ebpf/common/httpfltr_test.go b/pkg/internal/ebpf/common/httpfltr_test.go
index 1b1c3e324..42e5eedd9 100644
--- a/pkg/internal/ebpf/common/httpfltr_test.go
+++ b/pkg/internal/ebpf/common/httpfltr_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"testing"
+	"unsafe"
 
 	"github.com/cilium/ebpf/ringbuf"
 	"github.com/stretchr/testify/assert"
@@ -41,7 +42,7 @@ func TestHostInfo(t *testing.T) {
 		},
 	}
 
-	source, target := event.hostInfo()
+	source, target := (*BPFConnInfo)(unsafe.Pointer(&event.ConnInfo)).reqHostInfo()
 
 	assert.Equal(t, "192.168.0.1", source)
 	assert.Equal(t, "8.8.8.8", target)
@@ -53,7 +54,7 @@ func TestHostInfo(t *testing.T) {
 		},
 	}
 
-	source, target = event.hostInfo()
+	source, target = (*BPFConnInfo)(unsafe.Pointer(&event.ConnInfo)).reqHostInfo()
 
 	assert.Equal(t, "100::ffff:c0a8:1", source)
 	assert.Equal(t, "100::ffff:808:808", target)
@@ -62,10 +63,10 @@ func TestHostInfo(t *testing.T) {
 		ConnInfo: bpfConnectionInfoT{},
 	}
 
-	source, target = event.hostInfo()
+	source, target = (*BPFConnInfo)(unsafe.Pointer(&event.ConnInfo)).reqHostInfo()
 
-	assert.Equal(t, "::", source)
-	assert.Equal(t, "::", target)
+	assert.Equal(t, "", source)
+	assert.Equal(t, "", target)
 }
 
 func TestCstr(t *testing.T) {
diff --git a/pkg/internal/ebpf/common/httpfltr_transform.go b/pkg/internal/ebpf/common/httpfltr_transform.go
index 3fd1ee7d9..018e6b420 100644
--- a/pkg/internal/ebpf/common/httpfltr_transform.go
+++ b/pkg/internal/ebpf/common/httpfltr_transform.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"unsafe"
 
 	"github.com/cilium/ebpf/ringbuf"
 	"go.opentelemetry.io/otel/trace"
@@ -81,7 +82,7 @@ func HTTPInfoEventToSpan(event BPFHTTPInfo) (request.Span, bool, error) {
 	// When we can't find the connection info, we signal that through making the
 	// source and destination ports equal to max short. E.g. async SSL
 	if event.ConnInfo.S_port != 0 || event.ConnInfo.D_port != 0 {
-		source, target := event.hostInfo()
+		source, target := (*BPFConnInfo)(unsafe.Pointer(&event.ConnInfo)).reqHostInfo()
 		result.Host = target
 		result.Peer = source
 	} else {
@@ -168,15 +169,6 @@ func (event *BPFHTTPInfo) hostFromBuf() (string, int) {
 	return host, port
 }
 
-func (event *BPFHTTPInfo) hostInfo() (source, target string) {
-	src := make(net.IP, net.IPv6len)
-	dst := make(net.IP, net.IPv6len)
-	copy(src, event.ConnInfo.S_addr[:])
-	copy(dst, event.ConnInfo.D_addr[:])
-
-	return src.String(), dst.String()
-}
-
 func commName(pid uint32) string {
 	procPath := filepath.Join("/proc", strconv.FormatUint(uint64(pid), 10), "comm")
 	_, err := os.Stat(procPath)
diff --git a/pkg/internal/ebpf/common/spanner.go b/pkg/internal/ebpf/common/spanner.go
index 0b4f5f778..b4bcb1d87 100644
--- a/pkg/internal/ebpf/common/spanner.go
+++ b/pkg/internal/ebpf/common/spanner.go
@@ -3,7 +3,7 @@ package ebpfcommon
 import (
 	"bytes"
 	"log/slog"
-	"net"
+	"unsafe"
 
 	trace2 "go.opentelemetry.io/otel/trace"
 
@@ -31,7 +31,8 @@ func HTTPRequestTraceToSpan(trace *HTTPRequestTrace) request.Span {
 	hostPort := 0
 
 	if trace.Conn.S_port != 0 || trace.Conn.D_port != 0 {
-		peer, hostname = trace.hostInfo()
+		peer, hostname = (*BPFConnInfo)(unsafe.Pointer(&trace.Conn)).reqHostInfo()
+
 		hostPort = int(trace.Conn.D_port)
 	}
 
@@ -60,15 +61,6 @@ func HTTPRequestTraceToSpan(trace *HTTPRequestTrace) request.Span {
 	}
 }
 
-func (trace *HTTPRequestTrace) hostInfo() (source, target string) {
-	src := make(net.IP, net.IPv6len)
-	dst := make(net.IP, net.IPv6len)
-	copy(src, trace.Conn.S_addr[:])
-	copy(dst, trace.Conn.D_addr[:])
-
-	return src.String(), dst.String()
-}
-
 func SQLRequestTraceToSpan(trace *SQLRequestTrace) request.Span {
 	if request.EventType(trace.Type) != request.EventTypeSQLClient {
 		log.Warn("unknown trace type", "type", trace.Type)
diff --git a/pkg/internal/ebpf/common/spanner_test.go b/pkg/internal/ebpf/common/spanner_test.go
index 4a685d795..00ff9538e 100644
--- a/pkg/internal/ebpf/common/spanner_test.go
+++ b/pkg/internal/ebpf/common/spanner_test.go
@@ -2,6 +2,7 @@ package ebpfcommon
 
 import (
 	"testing"
+	"unsafe"
 
 	"github.com/stretchr/testify/assert"
 
@@ -114,3 +115,11 @@ func TestSpanNesting(t *testing.T) {
 	b = makeSpanWithTimings(10000, 30000, 30000)
 	assert.False(t, (&a).Inside(&b))
 }
+
+func Test_EmptyHostInfo(t *testing.T) {
+	tr := HTTPRequestTrace{}
+	src, dest := (*BPFConnInfo)(unsafe.Pointer(&tr.Conn)).reqHostInfo()
+
+	assert.Equal(t, src, "")
+	assert.Equal(t, dest, "")
+}
diff --git a/pkg/internal/ebpf/common/tcp_detect_transform.go b/pkg/internal/ebpf/common/tcp_detect_transform.go
index e5d5fac62..7f6ddc5ae 100644
--- a/pkg/internal/ebpf/common/tcp_detect_transform.go
+++ b/pkg/internal/ebpf/common/tcp_detect_transform.go
@@ -3,7 +3,6 @@ package ebpfcommon
 import (
 	"bytes"
 	"encoding/binary"
-	"net"
 
 	"github.com/cilium/ebpf/ringbuf"
 
@@ -76,15 +75,6 @@ func ReadTCPRequestIntoSpan(record *ringbuf.Record, filter ServiceFilter) (reque
 	return request.Span{}, true, nil // ignore if we couldn't parse it
 }
 
-func (connInfo *BPFConnInfo) reqHostInfo() (source, target string) {
-	src := make(net.IP, net.IPv6len)
-	dst := make(net.IP, net.IPv6len)
-	copy(src, connInfo.S_addr[:])
-	copy(dst, connInfo.D_addr[:])
-
-	return src.String(), dst.String()
-}
-
 func reverseTCPEvent(trace *TCPRequestInfo) {
 	if trace.Direction == 0 {
 		trace.Direction = 1
diff --git a/pkg/internal/ebpf/goredis/bpf_bpfel_arm64.o b/pkg/internal/ebpf/goredis/bpf_bpfel_arm64.o
index 90d9cf8ea..944e161fe 100644
Binary files a/pkg/internal/ebpf/goredis/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/goredis/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/goredis/bpf_bpfel_x86.o b/pkg/internal/ebpf/goredis/bpf_bpfel_x86.o
index 4fb7cf2ca..e0a27c9f7 100644
Binary files a/pkg/internal/ebpf/goredis/bpf_bpfel_x86.o and b/pkg/internal/ebpf/goredis/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/goredis/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/goredis/bpf_debug_bpfel_arm64.o
index 8bb18019b..9eca2ec74 100644
Binary files a/pkg/internal/ebpf/goredis/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/goredis/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/goredis/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/goredis/bpf_debug_bpfel_x86.o
index 1f4ee8e6f..7ed4d7eb8 100644
Binary files a/pkg/internal/ebpf/goredis/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/goredis/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/goruntime/bpf_bpfel_arm64.o b/pkg/internal/ebpf/goruntime/bpf_bpfel_arm64.o
index c2c4cac93..9aa83483d 100644
Binary files a/pkg/internal/ebpf/goruntime/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/goruntime/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/goruntime/bpf_bpfel_x86.o b/pkg/internal/ebpf/goruntime/bpf_bpfel_x86.o
index 99380eb0d..58b647d25 100644
Binary files a/pkg/internal/ebpf/goruntime/bpf_bpfel_x86.o and b/pkg/internal/ebpf/goruntime/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/goruntime/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/goruntime/bpf_debug_bpfel_arm64.o
index 915d0346d..63b51cc12 100644
Binary files a/pkg/internal/ebpf/goruntime/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/goruntime/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/goruntime/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/goruntime/bpf_debug_bpfel_x86.o
index 1ae72f4c2..8e323f9cd 100644
Binary files a/pkg/internal/ebpf/goruntime/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/goruntime/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o
index 030790b13..ba3250f8f 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o
index 6fabd4da2..cb1502622 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o and b/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o
index d72b4bf00..75f3b6314 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o
index 6eebf9d4e..8de127fcf 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o
index 9e9706afe..cea9e2994 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o and b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o
index d6860a69d..a89cf0324 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o and b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o
index 6797f3b1d..6c8763e59 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o and b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o
index 9e962e8d5..0f4b745fb 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o and b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_bpfel_arm64.o b/pkg/internal/ebpf/httpfltr/bpf_bpfel_arm64.o
index 99e4e57c3..c669318d1 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/httpfltr/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_bpfel_x86.o b/pkg/internal/ebpf/httpfltr/bpf_bpfel_x86.o
index 69706208e..08ea0d0d5 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_bpfel_x86.o and b/pkg/internal/ebpf/httpfltr/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_arm64.o
index 7b0f09b86..bc6a0b1e8 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_x86.o
index 814b4bd0b..19e59200f 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_arm64.o b/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_arm64.o
index 767f59dd0..3675f6ebb 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_arm64.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_x86.o b/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_x86.o
index 6ac319cfa..daf72e974 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_x86.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_arm64.o b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_arm64.o
index f9ca07fa4..c5c190778 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_arm64.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_x86.o b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_x86.o
index 8336a9806..69ba3c43a 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_x86.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_bpfel_arm64.o b/pkg/internal/ebpf/httpssl/bpf_bpfel_arm64.o
index f4251274c..eb4d22735 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/httpssl/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_bpfel_x86.o b/pkg/internal/ebpf/httpssl/bpf_bpfel_x86.o
index fb7ef0ad8..f604516d7 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_bpfel_x86.o and b/pkg/internal/ebpf/httpssl/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_arm64.o
index 753be0985..fdaf56fc3 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_x86.o
index b8ba85cd5..98e4bd260 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_arm64.o b/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_arm64.o
index 32f5a6a6a..a4aeb25e5 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_arm64.o and b/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_x86.o b/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_x86.o
index 9a12af143..bc9a4f902 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_x86.o and b/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_arm64.o b/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_arm64.o
index 4caabc39c..26e9d4bd9 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_arm64.o and b/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_x86.o b/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_x86.o
index 598fee11d..62a74df48 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_x86.o and b/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/kafkago/bpf_bpfel_arm64.o b/pkg/internal/ebpf/kafkago/bpf_bpfel_arm64.o
index 872e30cd6..5bb31683a 100644
Binary files a/pkg/internal/ebpf/kafkago/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/kafkago/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/kafkago/bpf_bpfel_x86.o b/pkg/internal/ebpf/kafkago/bpf_bpfel_x86.o
index 751a9d7a9..9038a4f29 100644
Binary files a/pkg/internal/ebpf/kafkago/bpf_bpfel_x86.o and b/pkg/internal/ebpf/kafkago/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/kafkago/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/kafkago/bpf_debug_bpfel_arm64.o
index 41b1bc7c2..facd2fad5 100644
Binary files a/pkg/internal/ebpf/kafkago/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/kafkago/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/kafkago/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/kafkago/bpf_debug_bpfel_x86.o
index 6321c864a..e9b5cbd38 100644
Binary files a/pkg/internal/ebpf/kafkago/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/kafkago/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/nethttp/bpf_bpfel_arm64.o b/pkg/internal/ebpf/nethttp/bpf_bpfel_arm64.o
index 2bc3a93ad..84830675e 100644
Binary files a/pkg/internal/ebpf/nethttp/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/nethttp/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/nethttp/bpf_bpfel_x86.o b/pkg/internal/ebpf/nethttp/bpf_bpfel_x86.o
index 3193fcbe5..1b6ddb89a 100644
Binary files a/pkg/internal/ebpf/nethttp/bpf_bpfel_x86.o and b/pkg/internal/ebpf/nethttp/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_arm64.o
index 0f8ee3cf6..cd7b0fedd 100644
Binary files a/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_x86.o
index 80a68ae7e..16ec2602c 100644
Binary files a/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/nethttp/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_arm64.o b/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_arm64.o
index f59841340..7845b8b23 100644
Binary files a/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_arm64.o and b/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_x86.o b/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_x86.o
index ed9524a97..d50a242a5 100644
Binary files a/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_x86.o and b/pkg/internal/ebpf/nethttp/bpf_tp_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_arm64.o b/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_arm64.o
index 9ea26ca6d..1c3fd0aa8 100644
Binary files a/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_arm64.o and b/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_x86.o b/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_x86.o
index 1d52c2e91..57a7e806e 100644
Binary files a/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_x86.o and b/pkg/internal/ebpf/nethttp/bpf_tp_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/nodejs/bpf_bpfel_arm64.o b/pkg/internal/ebpf/nodejs/bpf_bpfel_arm64.o
index d6876db2c..36fd902ee 100644
Binary files a/pkg/internal/ebpf/nodejs/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/nodejs/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/nodejs/bpf_bpfel_x86.o b/pkg/internal/ebpf/nodejs/bpf_bpfel_x86.o
index 6638478ba..d461bcd32 100644
Binary files a/pkg/internal/ebpf/nodejs/bpf_bpfel_x86.o and b/pkg/internal/ebpf/nodejs/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/nodejs/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/nodejs/bpf_debug_bpfel_arm64.o
index 2dcf0c075..506813940 100644
Binary files a/pkg/internal/ebpf/nodejs/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/nodejs/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/nodejs/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/nodejs/bpf_debug_bpfel_x86.o
index e9bac526a..5866757a7 100644
Binary files a/pkg/internal/ebpf/nodejs/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/nodejs/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/sarama/bpf_bpfel_arm64.o b/pkg/internal/ebpf/sarama/bpf_bpfel_arm64.o
index 1a71bdf56..accc01385 100644
Binary files a/pkg/internal/ebpf/sarama/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/sarama/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/sarama/bpf_bpfel_x86.o b/pkg/internal/ebpf/sarama/bpf_bpfel_x86.o
index 7e281ab4a..11dbae467 100644
Binary files a/pkg/internal/ebpf/sarama/bpf_bpfel_x86.o and b/pkg/internal/ebpf/sarama/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/sarama/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/sarama/bpf_debug_bpfel_arm64.o
index 4a9c67dc1..1720a2285 100644
Binary files a/pkg/internal/ebpf/sarama/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/sarama/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/sarama/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/sarama/bpf_debug_bpfel_x86.o
index 1ad76d778..0a98278f2 100644
Binary files a/pkg/internal/ebpf/sarama/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/sarama/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/watcher/bpf_bpfel_arm64.o b/pkg/internal/ebpf/watcher/bpf_bpfel_arm64.o
index d9d6511b4..30f6586d1 100644
Binary files a/pkg/internal/ebpf/watcher/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/watcher/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/watcher/bpf_bpfel_x86.o b/pkg/internal/ebpf/watcher/bpf_bpfel_x86.o
index a25519472..6627abbd8 100644
Binary files a/pkg/internal/ebpf/watcher/bpf_bpfel_x86.o and b/pkg/internal/ebpf/watcher/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/watcher/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/watcher/bpf_debug_bpfel_arm64.o
index 7d56d5f22..1a0c46364 100644
Binary files a/pkg/internal/ebpf/watcher/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/watcher/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/watcher/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/watcher/bpf_debug_bpfel_x86.o
index cc4783675..b0c26a4d2 100644
Binary files a/pkg/internal/ebpf/watcher/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/watcher/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/netolly/ebpf/net_bpfel_arm64.o b/pkg/internal/netolly/ebpf/net_bpfel_arm64.o
index 6d280fa69..272c9dd70 100644
Binary files a/pkg/internal/netolly/ebpf/net_bpfel_arm64.o and b/pkg/internal/netolly/ebpf/net_bpfel_arm64.o differ
diff --git a/pkg/internal/netolly/ebpf/net_bpfel_x86.o b/pkg/internal/netolly/ebpf/net_bpfel_x86.o
index b0c3d53df..4dbaf4aab 100644
Binary files a/pkg/internal/netolly/ebpf/net_bpfel_x86.o and b/pkg/internal/netolly/ebpf/net_bpfel_x86.o differ
diff --git a/pkg/internal/netolly/ebpf/netsk_bpfel_arm64.o b/pkg/internal/netolly/ebpf/netsk_bpfel_arm64.o
index 497328871..b5ac6afb1 100644
Binary files a/pkg/internal/netolly/ebpf/netsk_bpfel_arm64.o and b/pkg/internal/netolly/ebpf/netsk_bpfel_arm64.o differ
diff --git a/pkg/internal/netolly/ebpf/netsk_bpfel_x86.o b/pkg/internal/netolly/ebpf/netsk_bpfel_x86.o
index eee3287b1..a4a634e33 100644
Binary files a/pkg/internal/netolly/ebpf/netsk_bpfel_x86.o and b/pkg/internal/netolly/ebpf/netsk_bpfel_x86.o differ