feature: support higher versions of grpc-go (#183)

apache · May 26, 2024 · 8c78e5a · 8c78e5a
1 parent 9549d21
commit 8c78e5a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ Release Notes.
 * Support [Pulsar](https://github.com/apache/pulsar-client-go) MQ.
 * Support [Segmentio-Kafka](https://github.com/segmentio/kafka-go) MQ.
 * Support http headers collection for Gin
+* Support higher versions of grpc.
 
 #### Chore
 * Enhance the observability of makefile execution

diff --git a/plugins/grpc/instrument.go b/plugins/grpc/instrument.go
@@ -70,63 +70,52 @@ func (i *Instrument) Points() []*instrument.Point {
 		{
 			PackagePath: "",
 			At: instrument.NewMethodEnhance("*Server", "handleStream",
-				instrument.WithArgsCount(3),
 				instrument.WithArgType(0, "transport.ServerTransport")),
 			Interceptor: "ServerHandleStreamInterceptor ",
 		},
 		{
 			PackagePath: "",
 			At: instrument.NewMethodEnhance("*Server", "sendResponse",
-				instrument.WithArgsCount(6),
-				instrument.WithArgType(0, "transport.ServerTransport"),
 				instrument.WithResultType(0, "error")),
 			Interceptor: "ServerSendResponseInterceptor",
 		},
 		{
 			PackagePath: "",
 			At: instrument.NewMethodEnhance("*Server", "processUnaryRPC",
-				instrument.WithArgsCount(5),
-				instrument.WithArgType(0, "transport.ServerTransport"),
 				instrument.WithResultType(0, "error")),
 			Interceptor: "ServerUnaryInterceptor",
 		},
 		{
 			PackagePath: "",
 			At: instrument.NewMethodEnhance("*Server", "processStreamingRPC",
-				instrument.WithArgsCount(3),
-				instrument.WithArgType(0, "transport.ServerTransport"),
-				instrument.WithArgType(1, "*transport.Stream")),
+				instrument.WithResultType(0, "error")),
 			Interceptor: "ServerStreamingInterceptor",
 		},
 		{
 			PackagePath: "",
 			At: instrument.NewMethodEnhance("*clientStream", "SendMsg",
 				instrument.WithArgsCount(1),
-				instrument.WithArgType(0, "interface{}"),
 				instrument.WithResultType(0, "error")),
 			Interceptor: "ClientSendMsgInterceptor",
 		},
 		{
 			PackagePath: "",
 			At: instrument.NewMethodEnhance("*clientStream", "RecvMsg",
 				instrument.WithArgsCount(1),
-				instrument.WithArgType(0, "interface{}"),
 				instrument.WithResultType(0, "error")),
 			Interceptor: "ClientRecvMsgInterceptor",
 		},
 		{
 			PackagePath: "",
 			At: instrument.NewMethodEnhance("*serverStream", "SendMsg",
 				instrument.WithArgsCount(1),
-				instrument.WithArgType(0, "interface{}"),
 				instrument.WithResultType(0, "error")),
 			Interceptor: "ServerSendMsgInterceptor",
 		},
 		{
 			PackagePath: "",
 			At: instrument.NewMethodEnhance("*serverStream", "RecvMsg",
 				instrument.WithArgsCount(1),
-				instrument.WithArgType(0, "interface{}"),
 				instrument.WithResultType(0, "error")),
 			Interceptor: "ServerRecvMsgInterceptor",
 		},

diff --git a/plugins/grpc/server_sendresponse_interceptor.go b/plugins/grpc/server_sendresponse_interceptor.go
@@ -29,7 +29,15 @@ func (h *ServerSendResponseInterceptor) BeforeInvoke(invocation operator.Invocat
 	if tracing.ActiveSpan() == nil {
 		return nil
 	}
-	cs := invocation.Args()[1].(*nativeStream)
+	var cs *nativeStream
+	if arg1, ok := invocation.Args()[1].(*nativeStream); ok {
+		cs = arg1
+	} else if arg2, ok := invocation.Args()[2].(*nativeStream); ok {
+		cs = arg2
+	} else {
+		return nil
+	}
+
 	method := cs.Method()
 	s, err := tracing.CreateLocalSpan(formatOperationName(method, "/Server/Response/SendResponse"),
 		tracing.WithLayer(tracing.SpanLayerRPCFramework),

diff --git a/test/plugins/scenarios/grpc/plugin.yml b/test/plugins/scenarios/grpc/plugin.yml
@@ -25,3 +25,10 @@ support-version:
       - v1.55.0
       - v1.56.0
       - v1.57.0
+      - v1.58.0
+  - go: 1.19
+    framework:
+      - v1.59.0
+      - v1.60.0
+      - v1.62.0
+      - v1.64.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,3 +25,10 @@ support-version: @@
           - v1.55.0
           - v1.56.0
           - v1.57.0
+          - v1.58.0
+      - go: 1.19
+        framework:
+          - v1.59.0
+          - v1.60.0
+          - v1.62.0
+          - v1.64.0