Use multiples of 8 for field sizes

open-telemetry · May 6, 2024 · 3401852 · 3401852
1 parent 452b413
commit 3401852
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 35 deletions.
diff --git a/internal/pkg/inject/offset_results.json b/internal/pkg/inject/offset_results.json
@@ -984,7 +984,8 @@
                       "0.21.0",
                       "0.22.0",
                       "0.23.0",
-                      "0.24.0"
+                      "0.24.0",
+                      "0.25.0"
                     ]
                   }
                 ]
@@ -1023,7 +1024,8 @@
                       "0.21.0",
                       "0.22.0",
                       "0.23.0",
-                      "0.24.0"
+                      "0.24.0",
+                      "0.25.0"
                     ]
                   }
                 ]

diff --git a/internal/pkg/instrumentation/bpf/net/http/client/bpf/probe.bpf.c b/internal/pkg/instrumentation/bpf/net/http/client/bpf/probe.bpf.c
@@ -8,16 +8,16 @@ char __license[] SEC("license") = "Dual MIT/GPL";
 
 #define MAX_HOSTNAME_SIZE 128
 #define MAX_PROTO_SIZE 8
-#define MAX_PATH_SIZE 100
+#define MAX_PATH_SIZE 128
 #define MAX_SCHEME_SIZE 8
 #define MAX_OPAQUE_SIZE 8
 #define MAX_RAWPATH_SIZE 8
 #define MAX_RAWQUERY_SIZE 128
-#define MAX_FRAGMENT_SIZE 50
-#define MAX_RAWFRAGMENT_SIZE 50
+#define MAX_FRAGMENT_SIZE 56
+#define MAX_RAWFRAGMENT_SIZE 56
 #define MAX_USERNAME_SIZE 8
-#define MAX_METHOD_SIZE 10
-#define MAX_CONCURRENT 50
+#define MAX_METHOD_SIZE 16
+#define MAX_CONCURRENT 56
 
 struct http_request_t {
     BASE_SPAN_PROPERTIES

diff --git a/internal/pkg/instrumentation/bpf/net/http/client/bpf_arm64_bpfel.go b/internal/pkg/instrumentation/bpf/net/http/client/bpf_arm64_bpfel.go
diff --git a/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_arm64_bpfel.go b/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_arm64_bpfel.go
diff --git a/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_x86_bpfel.go b/internal/pkg/instrumentation/bpf/net/http/client/bpf_no_tp_x86_bpfel.go
diff --git a/internal/pkg/instrumentation/bpf/net/http/client/bpf_x86_bpfel.go b/internal/pkg/instrumentation/bpf/net/http/client/bpf_x86_bpfel.go
diff --git a/internal/pkg/instrumentation/bpf/net/http/client/probe.go b/internal/pkg/instrumentation/bpf/net/http/client/probe.go
@@ -236,15 +236,15 @@ type event struct {
 	Host        [128]byte
 	Proto       [8]byte
 	StatusCode  uint64
-	Method      [10]byte
-	Path        [100]byte
+	Method      [16]byte
+	Path        [128]byte
 	Scheme      [8]byte
 	Opaque      [8]byte
 	RawPath     [8]byte
 	Username    [8]byte
 	RawQuery    [128]byte
-	Fragment    [50]byte
-	RawFragment [50]byte
+	Fragment    [56]byte
+	RawFragment [56]byte
 	ForceQuery  uint8
 	OmitHost    uint8
 }

diff --git a/internal/pkg/instrumentation/bpf/net/http/client/probe_test.go b/internal/pkg/instrumentation/bpf/net/http/client/probe_test.go
@@ -50,9 +50,9 @@ func TestConvertEvent(t *testing.T) {
 	copy(proto[:], protoString)
 	var protoFoo [8]byte
 	copy(protoFoo[:], protoFooString)
-	var method [10]byte
+	var method [16]byte
 	copy(method[:], methodString)
-	var path [100]byte
+	var path [128]byte
 	copy(path[:], pathString)
 	var scheme [8]byte
 	copy(scheme[:], schemeString)
@@ -66,9 +66,9 @@ func TestConvertEvent(t *testing.T) {
 	copy(username[:], []byte(usernameString))
 	var rawQuery [128]byte
 	copy(rawQuery[:], []byte(rawQueryString))
-	var fragment [50]byte
+	var fragment [56]byte
 	copy(fragment[:], []byte(fragmentString))
-	var rawFragment [50]byte
+	var rawFragment [56]byte
 	copy(rawFragment[:], []byte(rawFragmentString))
 
 	spId, err := trace.SpanIDFromHex("00f067aa0ba902b7")