fix: grpc WithDetails if not proto.Message

This makes tests work with prutal
cloudwego · Feb 27, 2025 · 26fb8f1 · 26fb8f1
1 parent fc268fa
commit 26fb8f1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   run-tests:
-    runs-on: [ self-hosted, X64 ]
+    runs-on: [ self-hosted, Linux, X64 ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go

diff --git a/pbrpc/failedcall/error_handler/errhandler_test.go b/pbrpc/failedcall/error_handler/errhandler_test.go
@@ -33,6 +33,7 @@ import (
 	"github.com/cloudwego/kitex/pkg/transmeta"
 	"github.com/cloudwego/kitex/server"
 	"github.com/cloudwego/kitex/transport"
+	"google.golang.org/protobuf/proto"
 )
 
 var testaddr string
@@ -184,8 +185,11 @@ func TestHandlerReturnBizError(t *testing.T) {
 	test.Assert(t, bizerror.BizStatusCode() == 404)
 	test.Assert(t, bizerror.BizMessage() == "not found")
 	test.Assert(t, reflect.DeepEqual(bizerror.BizExtra(), map[string]string{"version": "v1.0.0"}))
-	str := bizerror.(status.Iface).GRPCStatus().Details()[0].(*stability.STRequest).Str
-	test.Assert(t, reflect.DeepEqual(str, "hello world"))
+	// only works for proto.Message
+	if _, ok := any((*stability.STRequest)(nil)).(proto.Message); ok {
+		str := bizerror.(status.Iface).GRPCStatus().Details()[0].(*stability.STRequest).Str
+		test.Assert(t, reflect.DeepEqual(str, "hello world"))
+	}
 }
 
 func TestHandlerPanic(t *testing.T) {

diff --git a/pbrpc/failedcall/error_handler/mockfailed_handler.go b/pbrpc/failedcall/error_handler/mockfailed_handler.go
@@ -23,6 +23,7 @@ import (
 	"github.com/cloudwego/kitex/pkg/kerrors"
 	"github.com/cloudwego/kitex/pkg/remote"
 	"github.com/cloudwego/kitex/pkg/remote/trans/nphttp2/status"
+	"google.golang.org/protobuf/proto"
 )
 
 var (
@@ -54,8 +55,12 @@ func (*STServiceHandler) TestSTReq(ctx context.Context, req *stability.STRequest
 	case "bizErrWithDetail":
 		bizStatusErr := kerrors.NewGRPCBizStatusErrorWithExtra(404, "not found", map[string]string{"version": "v1.0.0"})
 		if sterr, ok := bizStatusErr.(kerrors.GRPCStatusIface); ok {
-			st, _ := sterr.GRPCStatus().WithDetails(&stability.STRequest{Str: "hello world"})
-			sterr.SetGRPCStatus(st)
+			details := &stability.STRequest{Str: "hello world"} // WithDetails only works with proto.Message
+			v := any(details)
+			if m, ok := v.(proto.Message); ok {
+				st, _ := sterr.GRPCStatus().WithDetails(m)
+				sterr.SetGRPCStatus(st)
+			}
 		}
 		return nil, bizStatusErr
 	case panicStr:

diff --git a/thrift_streaming/generate.sh b/thrift_streaming/generate.sh
@@ -150,5 +150,7 @@ fi
 
 cd exitserver
 echo -e "\nbuilding exitserver @ $PWD\nPlease run ./update_go_mod.sh if any Go compatibility issue\n"
-go build
+# TODO: remove checklinkname if no longer needed.
+# we can not ugprade dymanicgo now, it may not work with the legacy kitex version
+go build -ldflags=-checklinkname=0
 mv exitserver $ROOT/binaries