Update grpc probe to support 1.77.0

Author: MrAlias

internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf/probe.bpf.c

@@ -226,7 +226,7 @@ UPROBE_RETURN(server_handleStream, struct grpc_request_t, grpc_events)
 // func (s *Server) handleStream(t transport.ServerTransport, stream *transport.ServerStream)
 // https://github.com/grpc/grpc-go/blob/317271b232677b7869576a49855b01b9f4775d67/server.go#L1735
 //
-// This is only compatible with versions > 1.69.0 of the Server.
+// This is only compatible with versions > 1.69.0 and < 1.77.0 of the Server.
 SEC("uprobe/server_handleStream2")
 int uprobe_server_handleStream2(struct pt_regs *ctx) {
     u64 server_stream_pos = 4;
@@ -301,6 +301,40 @@ int uprobe_server_handleStream2_Returns(struct pt_regs *ctx) {
     return 0;
 }
 
+// This instrumentation attaches uprobe to the following function:
+// func (s *Server) handleStream(t transport.ServerTransport, stream *transport.ServerStream)
+// https://github.com/grpc/grpc-go/blob/805b1f88c5fb9419e3837c72e1deb9c2ec677ffe/server.go#L1767
+//
+// This is only compatible with versions >= 1.77.0 of the Server.
+SEC("uprobe/server_handleStream3")
+int uprobe_server_handleStream3(struct pt_regs *ctx) {
+    u64 server_stream_pos = 4;
+    // Stream is embedded in ServerStream.
+    void *stream_pos = get_argument(ctx, server_stream_pos);
+    if (stream_pos == NULL) {
+        bpf_printk("grpc:server:uprobe/server_handleStream3: failed to get ServerStream.Stream arg");
+        return -1;
+    }
+
+    struct go_iface go_context = {0};
+    long rc = bpf_probe_read_user(
+        &go_context.type, sizeof(go_context.type), (void *)(stream_pos + stream_ctx_pos));
+    if (rc != 0) {
+        bpf_printk("grpc:server:uprobe/server_handleStream3: failed to read context type");
+        return -2;
+    }
+
+    rc = bpf_probe_read_user(&go_context.data,
+                             sizeof(go_context.data),
+                             get_go_interface_instance(stream_pos + stream_ctx_pos));
+    if (rc != 0) {
+        bpf_printk("grpc:server:uprobe/server_handleStream3: failed to read context data");
+        return -3;
+    }
+
+    return handleStream(ctx, stream_pos, &go_context);
+}
+
 // func (d *http2Server) operateHeader(frame *http2.MetaHeadersFrame) error
 // for version 1.60 and above:
 // func (t *http2Server) operateHeaders(ctx context.Context, frame *http2.MetaHeadersFrame, handle func(*Stream)) error

internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf_arm64_bpfel.go

@@ -41,6 +41,9 @@ var (
 	// handleStream methods changed to accept a *transport.ServerStream instead
 	// of a *transport.Stream.
 	serverStreamVersion = semver.New(1, 69, 0, "", "")
+	// embeddedStreamVersion is the version *transport.ServerStream embeds a
+	// Stream instead of a *Stream.
+	embeddedStreamVersion = semver.New(1, 77, 0, "", "")
 )
 
 // New returns a new [probe.Probe].
@@ -191,11 +194,29 @@ func New(logger *slog.Logger, ver string) probe.Probe {
 					Sym:         "google.golang.org/grpc.(*Server).handleStream",
 					EntryProbe:  "uprobe_server_handleStream2",
 					ReturnProbe: "uprobe_server_handleStream2_Returns",
+					PackageConstraints: []probe.PackageConstraints{
+						{
+							Package: "google.golang.org/grpc",
+							Constraints: must(semver.NewConstraint(
+								fmt.Sprintf(
+									"> %s, < %s",
+									serverStreamVersion,
+									embeddedStreamVersion,
+								),
+							)),
+							FailureMode: probe.FailureModeIgnore,
+						},
+					},
+				},
+				{
+					Sym:         "google.golang.org/grpc.(*Server).handleStream",
+					EntryProbe:  "uprobe_server_handleStream3",
+					ReturnProbe: "uprobe_server_handleStream_Returns",
 					PackageConstraints: []probe.PackageConstraints{
 						{
 							Package: "google.golang.org/grpc",
 							Constraints: must(
-								semver.NewConstraint(">= " + serverStreamVersion.String()),
+								semver.NewConstraint(">= " + embeddedStreamVersion.String()),
 							),
 							FailureMode: probe.FailureModeIgnore,
 						},