From 898ea5ff855c672846faf016c9d060d79a1af4ce Mon Sep 17 00:00:00 2001
From: Nikola Grcevski <grcevski@gmail.com>
Date: Wed, 27 Nov 2024 19:16:32 -0500
Subject: [PATCH] Add support for FastCGI protocol

---
 bpf/http_types.h                              |   1 +
 bpf/protocol_tcp.h                            |  59 ++++++--
 bpf/trace_common.h                            |  98 +++++++------
 bpf/tracing.h                                 |  13 +-
 .../ebpf/common/fast_cgi_detect_transform.go  | 133 ++++++++++++++++++
 .../ebpf/common/tcp_detect_transform.go       |  13 +-
 .../ebpf/generictracer/bpf_arm64_bpfel.go     |   3 +-
 .../ebpf/generictracer/bpf_arm64_bpfel.o      |   4 +-
 .../generictracer/bpf_debug_arm64_bpfel.go    |   3 +-
 .../generictracer/bpf_debug_arm64_bpfel.o     |   4 +-
 .../ebpf/generictracer/bpf_debug_x86_bpfel.go |   3 +-
 .../ebpf/generictracer/bpf_debug_x86_bpfel.o  |   4 +-
 .../ebpf/generictracer/bpf_tp_arm64_bpfel.go  |   3 +-
 .../ebpf/generictracer/bpf_tp_arm64_bpfel.o   |   4 +-
 .../generictracer/bpf_tp_debug_arm64_bpfel.go |   3 +-
 .../generictracer/bpf_tp_debug_arm64_bpfel.o  |   4 +-
 .../generictracer/bpf_tp_debug_x86_bpfel.go   |   3 +-
 .../generictracer/bpf_tp_debug_x86_bpfel.o    |   4 +-
 .../ebpf/generictracer/bpf_tp_x86_bpfel.go    |   3 +-
 .../ebpf/generictracer/bpf_tp_x86_bpfel.o     |   4 +-
 .../ebpf/generictracer/bpf_x86_bpfel.go       |   3 +-
 .../ebpf/generictracer/bpf_x86_bpfel.o        |   4 +-
 pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.go |   3 +-
 pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o  |   4 +-
 .../ebpf/gotracer/bpf_debug_arm64_bpfel.go    |   3 +-
 .../ebpf/gotracer/bpf_debug_arm64_bpfel.o     |   4 +-
 .../ebpf/gotracer/bpf_debug_x86_bpfel.go      |   3 +-
 .../ebpf/gotracer/bpf_debug_x86_bpfel.o       |   4 +-
 .../ebpf/gotracer/bpf_tp_arm64_bpfel.go       |   3 +-
 .../ebpf/gotracer/bpf_tp_arm64_bpfel.o        |   4 +-
 .../ebpf/gotracer/bpf_tp_debug_arm64_bpfel.go |   3 +-
 .../ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o  |   4 +-
 .../ebpf/gotracer/bpf_tp_debug_x86_bpfel.go   |   3 +-
 .../ebpf/gotracer/bpf_tp_debug_x86_bpfel.o    |   4 +-
 .../ebpf/gotracer/bpf_tp_x86_bpfel.go         |   3 +-
 pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o |   4 +-
 pkg/internal/ebpf/gotracer/bpf_x86_bpfel.go   |   3 +-
 pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o    |   4 +-
 .../ebpf/httptracer/bpf_arm64_bpfel.go        |   3 +-
 .../ebpf/httptracer/bpf_arm64_bpfel.o         |   4 +-
 .../ebpf/httptracer/bpf_debug_arm64_bpfel.go  |   3 +-
 .../ebpf/httptracer/bpf_debug_arm64_bpfel.o   |   4 +-
 .../ebpf/httptracer/bpf_debug_x86_bpfel.go    |   3 +-
 .../ebpf/httptracer/bpf_debug_x86_bpfel.o     |   4 +-
 pkg/internal/ebpf/httptracer/bpf_x86_bpfel.go |   3 +-
 pkg/internal/ebpf/httptracer/bpf_x86_bpfel.o  |   4 +-
 pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.go |   3 +-
 pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.o  |   4 +-
 .../ebpf/tctracer/bpf_debug_arm64_bpfel.go    |   3 +-
 .../ebpf/tctracer/bpf_debug_arm64_bpfel.o     |   4 +-
 .../ebpf/tctracer/bpf_debug_x86_bpfel.go      |   3 +-
 .../ebpf/tctracer/bpf_debug_x86_bpfel.o       |   4 +-
 pkg/internal/ebpf/tctracer/bpf_x86_bpfel.go   |   3 +-
 pkg/internal/ebpf/tctracer/bpf_x86_bpfel.o    |   4 +-
 54 files changed, 359 insertions(+), 126 deletions(-)
 create mode 100644 pkg/internal/ebpf/common/fast_cgi_detect_transform.go

diff --git a/bpf/http_types.h b/bpf/http_types.h
index 360ed3980..09f674f0a 100644
--- a/bpf/http_types.h
+++ b/bpf/http_types.h
@@ -96,6 +96,7 @@ typedef struct tp_info_pid {
     tp_info_t tp;
     u32 pid;
     u8 valid;
+    u8 type;
 } tp_info_pid_t;
 
 // Here we keep the information that is sent on the ring buffer
diff --git a/bpf/protocol_tcp.h b/bpf/protocol_tcp.h
index 9de0c40d0..a63385047 100644
--- a/bpf/protocol_tcp.h
+++ b/bpf/protocol_tcp.h
@@ -34,6 +34,32 @@ static __always_inline tcp_req_t *empty_tcp_req() {
     return value;
 }
 
+static __always_inline void init_new_trace(tp_info_t *tp) {
+    new_trace_id(tp);
+    __builtin_memset(tp->parent_id, 0, sizeof(tp->span_id));
+}
+
+static __always_inline void
+set_tcp_trace_info(u8 type, connection_info_t *conn, tp_info_t *tp, u32 pid) {
+    tp_info_pid_t *tp_p = tp_buf();
+
+    if (!tp_p) {
+        return;
+    }
+
+    tp_p->tp = *tp;
+    tp_p->tp.flags = 1;
+    tp_p->valid = 1;
+    tp_p->pid = pid; // used for avoiding finding stale server requests with client port reuse
+    tp_p->type = type;
+
+    set_trace_info_for_connection(conn, tp_p);
+    bpf_dbg_printk("Set traceinfo for conn");
+    dbg_print_http_connection_info(conn);
+
+    server_or_client_trace(type, conn, tp_p);
+}
+
 static __always_inline void handle_unknown_tcp_connection(pid_connection_info_t *pid_conn,
                                                           void *u_buf,
                                                           int bytes_len,
@@ -54,15 +80,30 @@ static __always_inline void handle_unknown_tcp_connection(pid_connection_info_t
             task_pid(&req->pid);
             bpf_probe_read(req->buf, K_TCP_MAX_LEN, u_buf);
 
-            tp_info_pid_t *server_tp = find_parent_trace(pid_conn);
+            req->tp.ts = bpf_ktime_get_ns();
 
-            if (server_tp && server_tp->valid && valid_trace(server_tp->tp.trace_id)) {
-                bpf_dbg_printk("Found existing server tp for client call");
-                __builtin_memcpy(
-                    req->tp.trace_id, server_tp->tp.trace_id, sizeof(req->tp.trace_id));
-                __builtin_memcpy(
-                    req->tp.parent_id, server_tp->tp.span_id, sizeof(req->tp.parent_id));
-                urand_bytes(req->tp.span_id, SPAN_ID_SIZE_BYTES);
+            bpf_dbg_printk("TCP request start, direction = %d, ssl = %d", direction, ssl);
+
+            if (direction == TCP_SEND) { // Client
+                u8 found = find_trace_for_client_request(pid_conn, &req->tp);
+                bpf_dbg_printk("Looking up client trace info, found %d", found);
+                if (found) {
+                    urand_bytes(req->tp.span_id, SPAN_ID_SIZE_BYTES);
+                } else {
+                    init_new_trace(&req->tp);
+                }
+
+                set_tcp_trace_info(EVENT_HTTP_CLIENT, &pid_conn->conn, &req->tp, pid_conn->pid);
+            } else { // Server
+                u8 found = find_trace_for_server_request(
+                    &pid_conn->conn, &req->tp, pid_conn->pid, EVENT_HTTP_REQUEST);
+                bpf_dbg_printk("Looking up server trace info, found %d", found);
+                if (found) {
+                    urand_bytes(req->tp.span_id, SPAN_ID_SIZE_BYTES);
+                } else {
+                    init_new_trace(&req->tp);
+                }
+                set_tcp_trace_info(EVENT_HTTP_REQUEST, &pid_conn->conn, &req->tp, pid_conn->pid);
             }
 
             bpf_map_update_elem(&ongoing_tcp_req, pid_conn, req, BPF_ANY);
@@ -90,6 +131,8 @@ static __always_inline void handle_unknown_tcp_connection(pid_connection_info_t
         bpf_clamp_umax(off, (K_TCP_MAX_LEN / 2));
         bpf_probe_read(existing->buf + off, (K_TCP_MAX_LEN / 2), u_buf);
         existing->len += bytes_len;
+    } else {
+        existing->len += bytes_len;
     }
 }
 
diff --git a/bpf/trace_common.h b/bpf/trace_common.h
index 58eafd693..2952317fe 100644
--- a/bpf/trace_common.h
+++ b/bpf/trace_common.h
@@ -189,13 +189,9 @@ static __always_inline u8 valid_trace(const unsigned char *trace_id) {
     return *((u64 *)trace_id) != 0 || *((u64 *)(trace_id + 8)) != 0;
 }
 
-static __always_inline void server_or_client_trace(http_connection_metadata_t *meta,
-                                                   connection_info_t *conn,
-                                                   tp_info_pid_t *tp_p) {
-    if (!meta) {
-        return;
-    }
-    if (meta->type == EVENT_HTTP_REQUEST) {
+static __always_inline void
+server_or_client_trace(u8 type, connection_info_t *conn, tp_info_pid_t *tp_p) {
+    if (type == EVENT_HTTP_REQUEST) {
         trace_key_t t_key = {0};
         task_tid(&t_key.p_key);
         t_key.extra_id = extra_runtime_id();
@@ -226,6 +222,52 @@ static __always_inline void server_or_client_trace(http_connection_metadata_t *m
     }
 }
 
+static __always_inline u8 find_trace_for_server_request(connection_info_t *conn,
+                                                        tp_info_t *tp,
+                                                        u32 current_pid,
+                                                        u8 current_type) {
+    u8 found_tp = 0;
+    tp_info_pid_t *existing_tp = bpf_map_lookup_elem(&incoming_trace_map, conn);
+    if (existing_tp) {
+        found_tp = 1;
+        bpf_dbg_printk("Found incoming (TCP) tp for server request");
+        __builtin_memcpy(tp->trace_id, existing_tp->tp.trace_id, sizeof(tp->trace_id));
+        __builtin_memcpy(tp->parent_id, existing_tp->tp.span_id, sizeof(tp->parent_id));
+        bpf_map_delete_elem(&incoming_trace_map, conn);
+    } else {
+        bpf_dbg_printk("Looking up tracemap for");
+        dbg_print_http_connection_info(conn);
+
+        existing_tp = trace_info_for_connection(conn);
+
+        bpf_dbg_printk("existing_tp %llx", existing_tp);
+
+        if (!disable_black_box_cp &&
+            correlated_requests(tp, current_pid, current_type, existing_tp)) {
+            found_tp = 1;
+            bpf_dbg_printk("Found existing correlated tp for server request");
+            __builtin_memcpy(tp->trace_id, existing_tp->tp.trace_id, sizeof(tp->trace_id));
+            __builtin_memcpy(tp->parent_id, existing_tp->tp.span_id, sizeof(tp->parent_id));
+        }
+    }
+
+    return found_tp;
+}
+
+static __always_inline u8 find_trace_for_client_request(pid_connection_info_t *p_conn,
+                                                        tp_info_t *tp) {
+    u8 found_tp = 0;
+    tp_info_pid_t *server_tp = find_parent_trace(p_conn);
+    if (server_tp && server_tp->valid && valid_trace(server_tp->tp.trace_id)) {
+        found_tp = 1;
+        bpf_dbg_printk("Found existing server tp for client call");
+        __builtin_memcpy(tp->trace_id, server_tp->tp.trace_id, sizeof(tp->trace_id));
+        __builtin_memcpy(tp->parent_id, server_tp->tp.span_id, sizeof(tp->parent_id));
+    }
+
+    return found_tp;
+}
+
 static __always_inline void get_or_create_trace_info(http_connection_metadata_t *meta,
                                                      u32 pid,
                                                      connection_info_t *conn,
@@ -248,45 +290,17 @@ static __always_inline void get_or_create_trace_info(http_connection_metadata_t
     u8 found_tp = 0;
 
     if (meta) {
+        tp_p->type = meta->type;
         if (meta->type == EVENT_HTTP_CLIENT) {
             pid_connection_info_t p_conn = {.pid = pid};
             __builtin_memcpy(&p_conn.conn, conn, sizeof(connection_info_t));
-            tp_info_pid_t *server_tp = find_parent_trace(&p_conn);
-
-            if (server_tp && server_tp->valid && valid_trace(server_tp->tp.trace_id)) {
-                found_tp = 1;
-                bpf_dbg_printk("Found existing server tp for client call");
-                __builtin_memcpy(
-                    tp_p->tp.trace_id, server_tp->tp.trace_id, sizeof(tp_p->tp.trace_id));
-                __builtin_memcpy(
-                    tp_p->tp.parent_id, server_tp->tp.span_id, sizeof(tp_p->tp.parent_id));
-            }
+            found_tp = find_trace_for_client_request(&p_conn, &tp_p->tp);
         } else {
             //bpf_dbg_printk("Looking up existing trace for connection");
             //dbg_print_http_connection_info(conn);
 
             // For server requests, we first look for TCP info (setup by TC ingress) and then we fall back to black-box info.
-            tp_info_pid_t *existing_tp = bpf_map_lookup_elem(&incoming_trace_map, conn);
-            if (existing_tp) {
-                found_tp = 1;
-                bpf_dbg_printk("Found incoming (TCP) tp for server request");
-                __builtin_memcpy(
-                    tp_p->tp.trace_id, existing_tp->tp.trace_id, sizeof(tp_p->tp.trace_id));
-                __builtin_memcpy(
-                    tp_p->tp.parent_id, existing_tp->tp.span_id, sizeof(tp_p->tp.parent_id));
-                bpf_map_delete_elem(&incoming_trace_map, conn);
-            } else {
-                existing_tp = trace_info_for_connection(conn);
-
-                if (!disable_black_box_cp && correlated_requests(tp_p, existing_tp)) {
-                    found_tp = 1;
-                    bpf_dbg_printk("Found existing correlated tp for server request");
-                    __builtin_memcpy(
-                        tp_p->tp.trace_id, existing_tp->tp.trace_id, sizeof(tp_p->tp.trace_id));
-                    __builtin_memcpy(
-                        tp_p->tp.parent_id, existing_tp->tp.span_id, sizeof(tp_p->tp.parent_id));
-                }
-            }
+            found_tp = find_trace_for_server_request(conn, &tp_p->tp, tp_p->pid, tp_p->type);
         }
     }
 
@@ -307,7 +321,9 @@ static __always_inline void get_or_create_trace_info(http_connection_metadata_t
     // for customers to enable it. Off by default.
     if (!capture_header_buffer) {
         set_trace_info_for_connection(conn, tp_p);
-        server_or_client_trace(meta, conn, tp_p);
+        if (meta) {
+            server_or_client_trace(meta->type, conn, tp_p);
+        }
         return;
     }
 
@@ -341,7 +357,9 @@ static __always_inline void get_or_create_trace_info(http_connection_metadata_t
 #endif
 
     set_trace_info_for_connection(conn, tp_p);
-    server_or_client_trace(meta, conn, tp_p);
+    if (meta) {
+        server_or_client_trace(meta->type, conn, tp_p);
+    }
 }
 
 #endif
diff --git a/bpf/tracing.h b/bpf/tracing.h
index ccbf26e11..730158911 100644
--- a/bpf/tracing.h
+++ b/bpf/tracing.h
@@ -74,16 +74,21 @@ static __always_inline u64 current_immediate_epoch(u64 ts) {
     return temp * NANOSECONDS_PER_IMM_EPOCH;
 }
 
-static __always_inline u8 correlated_requests(tp_info_pid_t *tp, tp_info_pid_t *existing_tp) {
+static __always_inline u8 correlated_requests(tp_info_t *tp,
+                                              u32 current_pid,
+                                              u8 current_type,
+                                              tp_info_pid_t *existing_tp) {
     if (!existing_tp) {
         return 0;
     }
 
     // We check for correlated requests which are in order, but from different PIDs
-    // Same PID means that we had client port reuse, which might falsely match prior
+    // Same PID means that we had client port reuse (*unless one was client and the other
+    // was a server request, i.e. the type check), which might falsely match prior
     // transaction if it happened during the same epoch.
-    if ((tp->tp.ts >= existing_tp->tp.ts) && (tp->pid != existing_tp->pid)) {
-        return current_epoch(tp->tp.ts) == current_epoch(existing_tp->tp.ts);
+    if ((tp->ts >= existing_tp->tp.ts) &&
+        ((current_pid != existing_tp->pid) || (current_type != existing_tp->type))) {
+        return current_epoch(tp->ts) == current_epoch(existing_tp->tp.ts);
     }
 
     return 0;
diff --git a/pkg/internal/ebpf/common/fast_cgi_detect_transform.go b/pkg/internal/ebpf/common/fast_cgi_detect_transform.go
new file mode 100644
index 000000000..5b410d30b
--- /dev/null
+++ b/pkg/internal/ebpf/common/fast_cgi_detect_transform.go
@@ -0,0 +1,133 @@
+package ebpfcommon
+
+import (
+	"bytes"
+	"unsafe"
+
+	trace2 "go.opentelemetry.io/otel/trace"
+
+	"github.com/grafana/beyla/pkg/internal/request"
+)
+
+const fastCGIRequestHeaderLen = 24
+const requestMethodKey = "REQUEST_METHOD"
+const requestURIKey = "REQUEST_URI"
+const scriptNameKey = "SCRIPT_NAME"
+const responseError = 7 // FCGI_STDERR
+
+func parseCGITable(b []byte) map[string]string {
+	res := map[string]string{}
+
+	for {
+		key := ""
+		val := ""
+		if len(b) <= 2 { // key len + val len
+			break
+		}
+
+		keyLen := int(b[0])
+		valLen := int(b[1])
+
+		if keyLen < 0 || valLen < 0 {
+			break
+		}
+
+		b = b[2:]
+
+		if keyLen > 0 && len(b) > keyLen {
+			key = string(b[:keyLen])
+			b = b[keyLen:]
+		}
+
+		if valLen > 0 && len(b) > valLen {
+			val = string(b[:valLen])
+			b = b[valLen:]
+		}
+
+		if key != "" {
+			res[key] = val
+		}
+	}
+
+	return res
+}
+
+func maybeFastCGI(b []byte) bool {
+	if len(b) <= fastCGIRequestHeaderLen {
+		return false
+	}
+
+	methodPos := bytes.Index(b, []byte(requestMethodKey))
+
+	return methodPos >= 0
+}
+
+func detectFastCGI(b, rb []byte) (string, string, int) {
+	b = b[fastCGIRequestHeaderLen:]
+
+	methodPos := bytes.Index(b, []byte(requestMethodKey))
+	if methodPos >= 0 {
+		kv := parseCGITable(b)
+
+		method, ok := kv[requestMethodKey]
+		if !ok {
+			return "", "", -1
+		}
+		uri, ok := kv[requestURIKey]
+		if !ok {
+			uri = kv[scriptNameKey]
+		}
+
+		// Translate the status code into HTTP, 200 OK, 500 ERR
+		status := 200
+
+		if len(rb) >= 2 {
+			if rb[1] == responseError {
+				status = 500
+			}
+		}
+
+		return method, uri, status
+	}
+	return "", "", -1
+}
+
+func TCPToFastCGIToSpan(trace *TCPRequestInfo, op, uri string, status int) request.Span {
+	peer := ""
+	hostname := ""
+	hostPort := 0
+
+	if trace.ConnInfo.S_port != 0 || trace.ConnInfo.D_port != 0 {
+		peer, hostname = (*BPFConnInfo)(unsafe.Pointer(&trace.ConnInfo)).reqHostInfo()
+		hostPort = int(trace.ConnInfo.D_port)
+	}
+
+	reqType := request.EventTypeHTTPClient
+	if trace.Direction == 0 {
+		reqType = request.EventTypeHTTP
+	}
+
+	return request.Span{
+		Type:          reqType,
+		Method:        op,
+		Path:          uri,
+		Peer:          peer,
+		PeerPort:      int(trace.ConnInfo.S_port),
+		Host:          hostname,
+		HostPort:      hostPort,
+		ContentLength: int64(trace.Len),
+		RequestStart:  int64(trace.StartMonotimeNs),
+		Start:         int64(trace.StartMonotimeNs),
+		End:           int64(trace.EndMonotimeNs),
+		Status:        status,
+		TraceID:       trace2.TraceID(trace.Tp.TraceId),
+		SpanID:        trace2.SpanID(trace.Tp.SpanId),
+		ParentSpanID:  trace2.SpanID(trace.Tp.ParentId),
+		Flags:         trace.Tp.Flags,
+		Pid: request.PidInfo{
+			HostPID:   trace.Pid.HostPid,
+			UserPID:   trace.Pid.UserPid,
+			Namespace: trace.Pid.Ns,
+		},
+	}
+}
diff --git a/pkg/internal/ebpf/common/tcp_detect_transform.go b/pkg/internal/ebpf/common/tcp_detect_transform.go
index 7f6ddc5ae..efada79e8 100644
--- a/pkg/internal/ebpf/common/tcp_detect_transform.go
+++ b/pkg/internal/ebpf/common/tcp_detect_transform.go
@@ -36,9 +36,18 @@ func ReadTCPRequestIntoSpan(record *ringbuf.Record, filter ServiceFilter) (reque
 
 	// Check if we have a SQL statement
 	op, table, sql := detectSQLBytes(b)
-	switch {
-	case validSQL(op, table):
+	if validSQL(op, table) {
 		return TCPToSQLToSpan(&event, op, table, sql), false, nil
+	}
+
+	if maybeFastCGI(b) {
+		op, uri, status := detectFastCGI(b, event.Rbuf[:rl])
+		if status >= 0 {
+			return TCPToFastCGIToSpan(&event, op, uri, status), false, nil
+		}
+	}
+
+	switch {
 	case isRedis(b) && isRedis(event.Rbuf[:rl]):
 		op, text, ok := parseRedisRequest(string(b))
 
diff --git a/pkg/internal/ebpf/generictracer/bpf_arm64_bpfel.go b/pkg/internal/ebpf/generictracer/bpf_arm64_bpfel.go
index 18f32a95f..c5eed3a6b 100644
--- a/pkg/internal/ebpf/generictracer/bpf_arm64_bpfel.go
+++ b/pkg/internal/ebpf/generictracer/bpf_arm64_bpfel.go
@@ -196,7 +196,8 @@ type bpfTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpfTraceKeyT struct {
diff --git a/pkg/internal/ebpf/generictracer/bpf_arm64_bpfel.o b/pkg/internal/ebpf/generictracer/bpf_arm64_bpfel.o
index 2463e8696..57470e182 100644
--- a/pkg/internal/ebpf/generictracer/bpf_arm64_bpfel.o
+++ b/pkg/internal/ebpf/generictracer/bpf_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:901c1861fadb70c62cbde8ed18facefbe429874c0ddc65e7d5b8a733ff5c1b75
-size 522312
+oid sha256:e31049746cbebc9f236fec4f7d19eba95412fd1cd0041d0e13b98df69eacdf6c
+size 529656
diff --git a/pkg/internal/ebpf/generictracer/bpf_debug_arm64_bpfel.go b/pkg/internal/ebpf/generictracer/bpf_debug_arm64_bpfel.go
index 9bba3be31..5c2895e1f 100644
--- a/pkg/internal/ebpf/generictracer/bpf_debug_arm64_bpfel.go
+++ b/pkg/internal/ebpf/generictracer/bpf_debug_arm64_bpfel.go
@@ -196,7 +196,8 @@ type bpf_debugTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_debugTraceKeyT struct {
diff --git a/pkg/internal/ebpf/generictracer/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/generictracer/bpf_debug_arm64_bpfel.o
index 9ffbe61da..d691a1f1e 100644
--- a/pkg/internal/ebpf/generictracer/bpf_debug_arm64_bpfel.o
+++ b/pkg/internal/ebpf/generictracer/bpf_debug_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1de3096504b0c70a83b572d58307ca29f2d80cc67f488771cc7eb7bdd47af46f
-size 852968
+oid sha256:5d75b5fd0aed494b133b996d8ed9add33a16d3b26f9f1e4637fa45b645f8b5ac
+size 892320
diff --git a/pkg/internal/ebpf/generictracer/bpf_debug_x86_bpfel.go b/pkg/internal/ebpf/generictracer/bpf_debug_x86_bpfel.go
index d4dd3e499..1cdf2d3d1 100644
--- a/pkg/internal/ebpf/generictracer/bpf_debug_x86_bpfel.go
+++ b/pkg/internal/ebpf/generictracer/bpf_debug_x86_bpfel.go
@@ -196,7 +196,8 @@ type bpf_debugTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_debugTraceKeyT struct {
diff --git a/pkg/internal/ebpf/generictracer/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/generictracer/bpf_debug_x86_bpfel.o
index 6a7c5a368..e99703356 100644
--- a/pkg/internal/ebpf/generictracer/bpf_debug_x86_bpfel.o
+++ b/pkg/internal/ebpf/generictracer/bpf_debug_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36282e7065f566fa2ee5959b1c7d833366a58fcec31852f35b46caabb3163f58
-size 852480
+oid sha256:724e49435339f5806d33b1819b9bba3124c13721a181232f9d4bb01ce156e14e
+size 891832
diff --git a/pkg/internal/ebpf/generictracer/bpf_tp_arm64_bpfel.go b/pkg/internal/ebpf/generictracer/bpf_tp_arm64_bpfel.go
index 21a6aa111..b22f24e2f 100644
--- a/pkg/internal/ebpf/generictracer/bpf_tp_arm64_bpfel.go
+++ b/pkg/internal/ebpf/generictracer/bpf_tp_arm64_bpfel.go
@@ -196,7 +196,8 @@ type bpf_tpTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_tpTraceKeyT struct {
diff --git a/pkg/internal/ebpf/generictracer/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/generictracer/bpf_tp_arm64_bpfel.o
index 2133b568d..9cea718f6 100644
--- a/pkg/internal/ebpf/generictracer/bpf_tp_arm64_bpfel.o
+++ b/pkg/internal/ebpf/generictracer/bpf_tp_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b864fd2d3608c18ebb35b1fba0ee54acbb79693ab1d1a0055101232646bcf9b1
-size 536088
+oid sha256:d3017b9586954df2783e20e18205c859cd4407ceba320c26f505741edbb4b52b
+size 543560
diff --git a/pkg/internal/ebpf/generictracer/bpf_tp_debug_arm64_bpfel.go b/pkg/internal/ebpf/generictracer/bpf_tp_debug_arm64_bpfel.go
index c6fabfe1f..d6e103e17 100644
--- a/pkg/internal/ebpf/generictracer/bpf_tp_debug_arm64_bpfel.go
+++ b/pkg/internal/ebpf/generictracer/bpf_tp_debug_arm64_bpfel.go
@@ -196,7 +196,8 @@ type bpf_tp_debugTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_tp_debugTraceKeyT struct {
diff --git a/pkg/internal/ebpf/generictracer/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/generictracer/bpf_tp_debug_arm64_bpfel.o
index 1f67802ef..2b58ccfd4 100644
--- a/pkg/internal/ebpf/generictracer/bpf_tp_debug_arm64_bpfel.o
+++ b/pkg/internal/ebpf/generictracer/bpf_tp_debug_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d38274bbcbc20147a6c9f8c7e32dcc75c3b6e881427095268d1f3118558b74af
-size 870528
+oid sha256:5d660efd760cf34d60a8aea85949f44b50e022a6ab37260ad4f7f72f55dcc3a1
+size 909832
diff --git a/pkg/internal/ebpf/generictracer/bpf_tp_debug_x86_bpfel.go b/pkg/internal/ebpf/generictracer/bpf_tp_debug_x86_bpfel.go
index 1344bb046..00ca1776d 100644
--- a/pkg/internal/ebpf/generictracer/bpf_tp_debug_x86_bpfel.go
+++ b/pkg/internal/ebpf/generictracer/bpf_tp_debug_x86_bpfel.go
@@ -196,7 +196,8 @@ type bpf_tp_debugTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_tp_debugTraceKeyT struct {
diff --git a/pkg/internal/ebpf/generictracer/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/generictracer/bpf_tp_debug_x86_bpfel.o
index 4727100d9..41e048477 100644
--- a/pkg/internal/ebpf/generictracer/bpf_tp_debug_x86_bpfel.o
+++ b/pkg/internal/ebpf/generictracer/bpf_tp_debug_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dde1fef8a69c1c1fca551d3a3d34033877b34960e886c46418576484b95b1970
-size 870048
+oid sha256:f98cf2273f99e3676c0493bdff7858f70450ae933f69b6786047fa8a768046f0
+size 909344
diff --git a/pkg/internal/ebpf/generictracer/bpf_tp_x86_bpfel.go b/pkg/internal/ebpf/generictracer/bpf_tp_x86_bpfel.go
index 7a40e7dd2..1c02a8548 100644
--- a/pkg/internal/ebpf/generictracer/bpf_tp_x86_bpfel.go
+++ b/pkg/internal/ebpf/generictracer/bpf_tp_x86_bpfel.go
@@ -196,7 +196,8 @@ type bpf_tpTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_tpTraceKeyT struct {
diff --git a/pkg/internal/ebpf/generictracer/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/generictracer/bpf_tp_x86_bpfel.o
index 7e6efca47..a83a076e6 100644
--- a/pkg/internal/ebpf/generictracer/bpf_tp_x86_bpfel.o
+++ b/pkg/internal/ebpf/generictracer/bpf_tp_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94e556cf09dbb675fccf4f1dec815d19d7f2e74d5674d472d710c92e13dfe5f6
-size 535488
+oid sha256:d84d54a45932a10e062a43577ff1180b42bbbb9e04a72f19aab117a3443e8eec
+size 542960
diff --git a/pkg/internal/ebpf/generictracer/bpf_x86_bpfel.go b/pkg/internal/ebpf/generictracer/bpf_x86_bpfel.go
index 4dd6e40aa..57249eaf4 100644
--- a/pkg/internal/ebpf/generictracer/bpf_x86_bpfel.go
+++ b/pkg/internal/ebpf/generictracer/bpf_x86_bpfel.go
@@ -196,7 +196,8 @@ type bpfTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpfTraceKeyT struct {
diff --git a/pkg/internal/ebpf/generictracer/bpf_x86_bpfel.o b/pkg/internal/ebpf/generictracer/bpf_x86_bpfel.o
index f0f41ee74..d015885eb 100644
--- a/pkg/internal/ebpf/generictracer/bpf_x86_bpfel.o
+++ b/pkg/internal/ebpf/generictracer/bpf_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:939822a2a053d06fdeccdf6b435831753b432e7716afaff20f9d930d7b9bddf3
-size 521712
+oid sha256:84548655d439b8750f9ff375a918a803336ef994a18fe9ecb2074b42750a01b5
+size 529064
diff --git a/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.go b/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.go
index ef639571d..6d2f217ab 100644
--- a/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.go
+++ b/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.go
@@ -162,7 +162,8 @@ type bpfTpInfoPidT struct {
 	Tp    bpfTpInfoT
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpfTpInfoT struct {
diff --git a/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o
index f0c083061..c896e5158 100644
--- a/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o
+++ b/pkg/internal/ebpf/gotracer/bpf_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2eddb3da6240b3f38e59d8e50bc2af0e5394a67e2e06c747ba3a525e90afe81d
-size 380752
+oid sha256:bba7d0065ba065473d0b5ec8db5b72e51eb8792866cd7cf8787bbdf38a6cae92
+size 380760
diff --git a/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.go b/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.go
index 4ddc9f8b5..ce7b57830 100644
--- a/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.go
+++ b/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.go
@@ -162,7 +162,8 @@ type bpf_debugTpInfoPidT struct {
 	Tp    bpf_debugTpInfoT
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_debugTpInfoT struct {
diff --git a/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.o
index d5ecebd8f..f2dfaafce 100644
--- a/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.o
+++ b/pkg/internal/ebpf/gotracer/bpf_debug_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:617e4272e192efe8fd4bd83f6ac1bab47a26a426238c16054d04a62173fa777d
-size 883880
+oid sha256:cb55abe3151dab0cc2955e2d0c395498917c1d76eb278cf49b73792d95d1bf54
+size 883896
diff --git a/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.go b/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.go
index 8f46eaa98..942622837 100644
--- a/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.go
+++ b/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.go
@@ -162,7 +162,8 @@ type bpf_debugTpInfoPidT struct {
 	Tp    bpf_debugTpInfoT
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_debugTpInfoT struct {
diff --git a/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.o
index d93bdaf4e..e3efc004d 100644
--- a/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.o
+++ b/pkg/internal/ebpf/gotracer/bpf_debug_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30f75b36b2ec2bfea2b668f286a87885789f6f9fd9e2af43c02c7813ab23f449
-size 885680
+oid sha256:ecb6a331222b25980de98076e57dbc1b78a7ad1498a67a2012eba5c34e70379c
+size 885696
diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.go b/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.go
index 0ca8e55ad..ef176d491 100644
--- a/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.go
+++ b/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.go
@@ -174,7 +174,8 @@ type bpf_tpTpInfoPidT struct {
 	Tp    bpf_tpTpInfoT
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_tpTpInfoT struct {
diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.o
index 93e2b2d79..4cd315bca 100644
--- a/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.o
+++ b/pkg/internal/ebpf/gotracer/bpf_tp_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2767655e494656042bb6a0f5b335d82ebd1fb08c62d61e53c002f4fcece2867b
-size 427872
+oid sha256:edf34faaa946a4fbb7c7d2e552fdd91650f0e7e13de305d1ecd12ec3287f4990
+size 427880
diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.go b/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.go
index f477747aa..e2b30b060 100644
--- a/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.go
+++ b/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.go
@@ -174,7 +174,8 @@ type bpf_tp_debugTpInfoPidT struct {
 	Tp    bpf_tp_debugTpInfoT
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_tp_debugTpInfoT struct {
diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o
index bba6c6e1f..3de0b8905 100644
--- a/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o
+++ b/pkg/internal/ebpf/gotracer/bpf_tp_debug_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a8fdee2799b08cdb3def4d811cd3281efb963a64a97efab45c783bba6b3116c
-size 984248
+oid sha256:c542c220aebd0294ea3637a9cf36e35b3d06517a9d45f509ba87efe121886adb
+size 984256
diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.go b/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.go
index 9d2d99cec..fc15c7efd 100644
--- a/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.go
+++ b/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.go
@@ -174,7 +174,8 @@ type bpf_tp_debugTpInfoPidT struct {
 	Tp    bpf_tp_debugTpInfoT
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_tp_debugTpInfoT struct {
diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.o
index ded2ff625..24c21d6e3 100644
--- a/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.o
+++ b/pkg/internal/ebpf/gotracer/bpf_tp_debug_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e985ed6c99acf230309893e8c5b7970c48d28acee6cfe30687393a1dd83fa43
-size 986040
+oid sha256:bc9da72d8e89feeb33c694e7b38c29f72e2c2da60f37826ba288eff02da1eb97
+size 986048
diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.go b/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.go
index e4e1443cd..54a5040a7 100644
--- a/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.go
+++ b/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.go
@@ -174,7 +174,8 @@ type bpf_tpTpInfoPidT struct {
 	Tp    bpf_tpTpInfoT
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_tpTpInfoT struct {
diff --git a/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o
index 98cde2370..46374c463 100644
--- a/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o
+++ b/pkg/internal/ebpf/gotracer/bpf_tp_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02e3ef0adbe8a489ad236fb8e3d4b103cadd67f97ec52cd547691413aa487adc
-size 429632
+oid sha256:994e09b479428469853a7da8d17e74149e1d1a072db241aee8c3f8405df616fc
+size 429648
diff --git a/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.go b/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.go
index c26c864d4..1fa4504a2 100644
--- a/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.go
+++ b/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.go
@@ -162,7 +162,8 @@ type bpfTpInfoPidT struct {
 	Tp    bpfTpInfoT
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpfTpInfoT struct {
diff --git a/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o b/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o
index 74915f551..ed9bf8ffe 100644
--- a/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o
+++ b/pkg/internal/ebpf/gotracer/bpf_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cad7a4ba19d684c65b254551d770eaaa115a465f35c5c5413cec4d011baf4291
-size 382584
+oid sha256:c9e968a2f2dc9e71042344baf7285a16b70cdaa9db62fe6d688ab2e5f79e5bb8
+size 382592
diff --git a/pkg/internal/ebpf/httptracer/bpf_arm64_bpfel.go b/pkg/internal/ebpf/httptracer/bpf_arm64_bpfel.go
index d05b4a32b..ff0c9ecdd 100644
--- a/pkg/internal/ebpf/httptracer/bpf_arm64_bpfel.go
+++ b/pkg/internal/ebpf/httptracer/bpf_arm64_bpfel.go
@@ -53,7 +53,8 @@ type bpfTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 // loadBpf returns the embedded CollectionSpec for bpf.
diff --git a/pkg/internal/ebpf/httptracer/bpf_arm64_bpfel.o b/pkg/internal/ebpf/httptracer/bpf_arm64_bpfel.o
index fcad8487b..bf25339f5 100644
--- a/pkg/internal/ebpf/httptracer/bpf_arm64_bpfel.o
+++ b/pkg/internal/ebpf/httptracer/bpf_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0aed50f8a73c6152bc9a00d4d5108de3d9de07dde2cdba6bee4449cd6675b6cd
-size 42872
+oid sha256:11f87084cb1b5ff6f0b530a2100845645d47bf2b5957e152ffe38346ed37c687
+size 42880
diff --git a/pkg/internal/ebpf/httptracer/bpf_debug_arm64_bpfel.go b/pkg/internal/ebpf/httptracer/bpf_debug_arm64_bpfel.go
index 089b95fe7..167946cc1 100644
--- a/pkg/internal/ebpf/httptracer/bpf_debug_arm64_bpfel.go
+++ b/pkg/internal/ebpf/httptracer/bpf_debug_arm64_bpfel.go
@@ -53,7 +53,8 @@ type bpf_debugTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 // loadBpf_debug returns the embedded CollectionSpec for bpf_debug.
diff --git a/pkg/internal/ebpf/httptracer/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/httptracer/bpf_debug_arm64_bpfel.o
index 5673378f2..59ddaf3db 100644
--- a/pkg/internal/ebpf/httptracer/bpf_debug_arm64_bpfel.o
+++ b/pkg/internal/ebpf/httptracer/bpf_debug_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:facde3bae441088f2dfd58147595392624d9c65cb619bf84fb83d5c28e533ca5
-size 43112
+oid sha256:699b0fcd8d325c13659470a9222ba33470fbf27942b8b55dc3b71e09bbe9f5cf
+size 43128
diff --git a/pkg/internal/ebpf/httptracer/bpf_debug_x86_bpfel.go b/pkg/internal/ebpf/httptracer/bpf_debug_x86_bpfel.go
index 538fc50ca..333567c57 100644
--- a/pkg/internal/ebpf/httptracer/bpf_debug_x86_bpfel.go
+++ b/pkg/internal/ebpf/httptracer/bpf_debug_x86_bpfel.go
@@ -53,7 +53,8 @@ type bpf_debugTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 // loadBpf_debug returns the embedded CollectionSpec for bpf_debug.
diff --git a/pkg/internal/ebpf/httptracer/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/httptracer/bpf_debug_x86_bpfel.o
index f4eb69b82..6f66c160f 100644
--- a/pkg/internal/ebpf/httptracer/bpf_debug_x86_bpfel.o
+++ b/pkg/internal/ebpf/httptracer/bpf_debug_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc461947e3b312b962beb4aa8d92ea325a2f313d1268484866e8752e3b6def0b
-size 43000
+oid sha256:05880a2cd9d1c78aca89f9036131b64773ba241dd0c0e219e5c0d4b9654c14bf
+size 43008
diff --git a/pkg/internal/ebpf/httptracer/bpf_x86_bpfel.go b/pkg/internal/ebpf/httptracer/bpf_x86_bpfel.go
index 0461f36c3..c3c9df16f 100644
--- a/pkg/internal/ebpf/httptracer/bpf_x86_bpfel.go
+++ b/pkg/internal/ebpf/httptracer/bpf_x86_bpfel.go
@@ -53,7 +53,8 @@ type bpfTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 // loadBpf returns the embedded CollectionSpec for bpf.
diff --git a/pkg/internal/ebpf/httptracer/bpf_x86_bpfel.o b/pkg/internal/ebpf/httptracer/bpf_x86_bpfel.o
index e19c67211..4e731a15a 100644
--- a/pkg/internal/ebpf/httptracer/bpf_x86_bpfel.o
+++ b/pkg/internal/ebpf/httptracer/bpf_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbc5f7d559cda9471e514afd89a22555bfa453bc6981ae393364df38ee349a1d
-size 42760
+oid sha256:51f72be732485762d1efbb1beffac4b31ee243fcf6a0816a8542d43bcd571f8e
+size 42768
diff --git a/pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.go b/pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.go
index b98794077..4991a2d50 100644
--- a/pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.go
+++ b/pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.go
@@ -201,7 +201,8 @@ type bpfTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpfTraceKeyT struct {
diff --git a/pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.o b/pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.o
index c018e90f6..703178025 100644
--- a/pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.o
+++ b/pkg/internal/ebpf/tctracer/bpf_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a10a0d94a52394c8f87c66d531d1d2066b67d459ce14e611f00851d0fdaf719
-size 196272
+oid sha256:ed2bb441917d39f8de5f3710a60dc61a79053a541d2819b50d979dc1e86c68db
+size 203616
diff --git a/pkg/internal/ebpf/tctracer/bpf_debug_arm64_bpfel.go b/pkg/internal/ebpf/tctracer/bpf_debug_arm64_bpfel.go
index a2900ffca..853721b83 100644
--- a/pkg/internal/ebpf/tctracer/bpf_debug_arm64_bpfel.go
+++ b/pkg/internal/ebpf/tctracer/bpf_debug_arm64_bpfel.go
@@ -201,7 +201,8 @@ type bpf_debugTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_debugTraceKeyT struct {
diff --git a/pkg/internal/ebpf/tctracer/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/tctracer/bpf_debug_arm64_bpfel.o
index c97170210..83ad088da 100644
--- a/pkg/internal/ebpf/tctracer/bpf_debug_arm64_bpfel.o
+++ b/pkg/internal/ebpf/tctracer/bpf_debug_arm64_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71f4c902cdfbff09b16230c7d727590462c20b056533176b4bfd54d87bbbe63f
-size 339464
+oid sha256:b18c5ef2214c2cb6c2b0c5775b91ad68c1a7721b2cced5d92527aaeece9d282e
+size 377424
diff --git a/pkg/internal/ebpf/tctracer/bpf_debug_x86_bpfel.go b/pkg/internal/ebpf/tctracer/bpf_debug_x86_bpfel.go
index 9ebc167f3..ed58a4b63 100644
--- a/pkg/internal/ebpf/tctracer/bpf_debug_x86_bpfel.go
+++ b/pkg/internal/ebpf/tctracer/bpf_debug_x86_bpfel.go
@@ -201,7 +201,8 @@ type bpf_debugTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpf_debugTraceKeyT struct {
diff --git a/pkg/internal/ebpf/tctracer/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/tctracer/bpf_debug_x86_bpfel.o
index 31ff269c4..f07e67369 100644
--- a/pkg/internal/ebpf/tctracer/bpf_debug_x86_bpfel.o
+++ b/pkg/internal/ebpf/tctracer/bpf_debug_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08f2a65445f7f5323e54dc62e05d9f253c326b833c2fa23fa8daa5204847dca2
-size 340768
+oid sha256:0a86c7e60b166f5bd638c433a5e3e4b444dd6d83bd3d63d4bb5bb7c17ee7b07e
+size 378728
diff --git a/pkg/internal/ebpf/tctracer/bpf_x86_bpfel.go b/pkg/internal/ebpf/tctracer/bpf_x86_bpfel.go
index 83cccce57..8efc1f507 100644
--- a/pkg/internal/ebpf/tctracer/bpf_x86_bpfel.go
+++ b/pkg/internal/ebpf/tctracer/bpf_x86_bpfel.go
@@ -201,7 +201,8 @@ type bpfTpInfoPidT struct {
 	}
 	Pid   uint32
 	Valid uint8
-	_     [3]byte
+	Type  uint8
+	_     [2]byte
 }
 
 type bpfTraceKeyT struct {
diff --git a/pkg/internal/ebpf/tctracer/bpf_x86_bpfel.o b/pkg/internal/ebpf/tctracer/bpf_x86_bpfel.o
index e23033b77..9c287fd3a 100644
--- a/pkg/internal/ebpf/tctracer/bpf_x86_bpfel.o
+++ b/pkg/internal/ebpf/tctracer/bpf_x86_bpfel.o
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54e45d8d38195633a89be7cd688f2f8b547c0586ec345b998cb95cf8304d31da
-size 197576
+oid sha256:396afcd2b1040c006fabbf76d13fb69946024cb3b5010d562ca0b2e71cfcfa25
+size 204928