Skip to content

chore: update dependencies and add ErrRPCFinish back for compatibility #1953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DMwangnima merged 3 commits into from
Apr 24, 2026
Merged

chore: update dependencies and add ErrRPCFinish back for compatibility #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a2bf1d
chore: update dependencies and add ErrRPCFinish back for compatibility
DMwangnima Apr 24, 2026
f20facb
Revise deprecation comment for ErrRPCFinish
YangruiEmma Apr 24, 2026
023e4f6
chore: update unit tests
DMwangnima Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/cloudwego/kitex
go 1.20

require (
github.com/bytedance/gopkg v0.1.3
github.com/bytedance/gopkg v0.1.4
github.com/bytedance/sonic v1.15.0
github.com/cloudwego/configmanager v0.2.3
github.com/cloudwego/dynamicgo v0.8.0
github.com/cloudwego/fastpb v0.0.5
github.com/cloudwego/fastpb v0.0.6
github.com/cloudwego/frugal v0.3.1
github.com/cloudwego/gopkg v0.1.8
github.com/cloudwego/gopkg v0.2.0
github.com/cloudwego/localsession v0.2.1
github.com/cloudwego/netpoll v0.7.2
github.com/cloudwego/prutal v0.1.3
Expand All @@ -21,7 +21,7 @@ require (
github.com/json-iterator/go v1.1.12
github.com/tidwall/gjson v1.17.3
golang.org/x/net v0.24.0
golang.org/x/sync v0.8.0
golang.org/x/sync v0.11.0
golang.org/x/sys v0.30.0
golang.org/x/tools v0.6.0
google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384
Expand Down
15 changes: 8 additions & 7 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/bytedance/gopkg v0.1.1/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
github.com/bytedance/gopkg v0.1.4 h1:oZnQwnX82KAIWb7033bEwtxvTqXcYMxDBaQxo5JJHWM=
github.com/bytedance/gopkg v0.1.4/go.mod h1:v1zWfPm21Fb+OsyXN2VAHdL6TBb2L88anLQgdyje6R4=
github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE=
github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k=
github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE=
Expand All @@ -15,13 +15,13 @@ github.com/cloudwego/configmanager v0.2.3 h1:P0YTBgqDBnKeI/VARvut/Dc9Rfxt9Bw1Nv7
github.com/cloudwego/configmanager v0.2.3/go.mod h1:4GeSKjH6JLvKx4/Hrbh5dse8fDqj1n/Up8HfU4wHJ+w=
github.com/cloudwego/dynamicgo v0.8.0 h1:G5rjZlmXGgORR6jGe6MXQ6JjlGSI+e3eo9a4aCJGjsQ=
github.com/cloudwego/dynamicgo v0.8.0/go.mod h1:otlgzHhn68GH0vlmCGE0EAwcLEV8+n4yrbpocJ8hk+s=
github.com/cloudwego/fastpb v0.0.5 h1:vYnBPsfbAtU5TVz5+f9UTlmSCixG9F9vRwaqE0mZPZU=
github.com/cloudwego/fastpb v0.0.5/go.mod h1:Bho7aAKBUtT9RPD2cNVkTdx4yQumfSv3If7wYnm1izk=
github.com/cloudwego/fastpb v0.0.6 h1:i/RlQhtQHe7IevZCO82SHH0+hMp0OEJM5s9shQT5S20=
github.com/cloudwego/fastpb v0.0.6/go.mod h1:Bho7aAKBUtT9RPD2cNVkTdx4yQumfSv3If7wYnm1izk=
github.com/cloudwego/frugal v0.3.1 h1:dx+jacEWSChinpzpaaJnsdT9ANlMsw6+sNkajeOzh1U=
github.com/cloudwego/frugal v0.3.1/go.mod h1:pMk46fFyAwUbW7q7lfdK7c6HsD6bWtu6/3Vhz63CgsY=
github.com/cloudwego/gopkg v0.1.4/go.mod h1:FQuXsRWRsSqJLsMVd5SYzp8/Z1y5gXKnVvRrWUOsCMI=
github.com/cloudwego/gopkg v0.1.8 h1:ma9oACsY3v6xJwQ8NUc/h19GLV2ZCIjx0P6hqaSIlt4=
github.com/cloudwego/gopkg v0.1.8/go.mod h1:FQuXsRWRsSqJLsMVd5SYzp8/Z1y5gXKnVvRrWUOsCMI=
github.com/cloudwego/gopkg v0.2.0 h1:EU8Ahrj0rCfKZQdah50zKnlrQ1o2AdPYM87UclIqLME=
github.com/cloudwego/gopkg v0.2.0/go.mod h1:WjQPYI8PesfQalIVcLzVJBb1EAopioZ+D+3UGJ+dNBs=
github.com/cloudwego/localsession v0.2.1 h1:obiuwSP2MQX+fFot3HjOQjvR5o7FlSc8Z4e5EM+NqRY=
github.com/cloudwego/localsession v0.2.1/go.mod h1:J4uams2YT/2d4t7OI6A7NF7EcG8OlHJsOX2LdPbqoyc=
github.com/cloudwego/netpoll v0.7.2 h1:4qDBGQ6CG2SvEXhZSDxMdtqt/NLDxjAVk0PC/biKiJo=
Expand Down Expand Up @@ -172,8 +172,9 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand Down
1 change: 1 addition & 0 deletions pkg/generic/thrift/raw_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func TestRawWriter_Write(t *testing.T) {

// normal message
buf = buf[:0]
out = bufiox.NewBytesWriter(&buf)
err = w.Write(context.Background(), out, []byte("hello world"), "method", true, nil)
test.Assert(t, err == nil)
err = out.Flush()
Expand Down
5 changes: 5 additions & 0 deletions pkg/kerrors/kerrors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ var (
ErrBiz = &basicError{"biz error"}

ErrRetry = &basicError{"retry error"}
// Deprecated: ErrRPCFinish was used to indicate that the result of this retry
// call should be discarded because another attempt has already received and
// started decoding the response.
// No longer needed since v0.15.0, but kept for backward compatibility.
ErrRPCFinish = &basicError{"rpc call finished"}
// ErrRoute happens when router fail to route this call
ErrRoute = &basicError{"rpc route failed"}
// ErrPayloadValidation happens when payload validation failed
Expand Down
2 changes: 1 addition & 1 deletion pkg/remote/codec/thrift/codec_apache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestGetSkippedStructBuffer(t *testing.T) {
_, err = skipThriftStruct(trans)
test.Assert(t, err != nil, err)
test.Assert(t, strings.Contains(err.Error(), "skipThriftStruct"))
test.Assert(t, strings.Contains(err.Error(), "EOF"))
test.Assert(t, strings.Contains(err.Error(), "EOF") || strings.Contains(err.Error(), "no remaining data"))
}

func TestApacheMarshalUnmarshal(t *testing.T) {
Expand Down
6 changes: 6 additions & 0 deletions pkg/remote/trans/gonet/trans_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ func TestServeConn(t *testing.T) {

// OnRead Error
expectedErr = fmt.Errorf("OnReadError")
// ReadFunc must return data so that Peek(1) in serveConn succeeds,
// otherwise bufiox.DefaultReader returns "multiple Read calls return no data or error".
mockConn.ReadFunc = func(b []byte) (n int, err error) {
b[0] = 0
return 1, nil
}
transSvr.transHdlr = &mocks.MockSvrTransHandler{
OnActiveFunc: svrTransHdlr.OnActive,
OnReadFunc: func(ctx context.Context, conn net.Conn) error {
Expand Down
Loading