Skip to content
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

Jump to bottom

bugfix - triple protocol request doesn't carry attachment such as group or version. #1700

Merged
merged 8 commits into from
Jan 7, 2022
Merged

bugfix - triple protocol request doesn't carry attachment such as group or version. #1700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b048366
Merge pull request #1 from apache/3.0
ztelur May 1, 2021
08708bd
Merge branch 'apache:3.0' into 3.0
ztelur May 15, 2021
b343b9a
improve etcd version and change create to put
ztelur May 15, 2021
4279f22
Merge branch 'apache:3.0' into 3.0
ztelur May 19, 2021
8f82498
Merge branch '3.0' of https://github.com/ztelur/dubbo-go into 3.0
ztelur Dec 17, 2021
1fa8a6e
Merge branch '3.0' of https://github.com/ztelur/dubbo-go into 3.0
ztelur Jan 4, 2022
4a13d26
triple attachment
ztelur Jan 4, 2022
0ce9c56
Merge remote-tracking branch 'upstream/3.0' into bugfix-triple-attach…
LaurenceLiZhixin Jan 5, 2022
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
12 changes: 12 additions & 0 deletions protocol/dubbo3/dubbo3_invoker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ import (
invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
)

// same as dubbo_invoker.go attachmentKey
var attachmentKey = []string{
constant.InterfaceKey, constant.GroupKey, constant.TokenKey, constant.TimeoutKey,
constant.VersionKey,
}

// DubboInvoker is implement of protocol.Invoker, a dubboInvoker refer to one service and ip.
type DubboInvoker struct {
protocol.BaseInvoker
Expand Down Expand Up @@ -166,6 +172,12 @@ func (di *DubboInvoker) Invoke(ctx context.Context, invocation protocol.Invocati
return &result
}

for _, k := range attachmentKey {
if v := di.GetURL().GetParam(k, ""); len(v) > 0 {
invocation.SetAttachments(k, v)
}
}

// append interface id to ctx
gRPCMD := make(metadata.MD, 0)
for k, v := range invocation.Attachments() {
Expand Down
10 changes: 8 additions & 2 deletions protocol/dubbo3/dubbo3_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (

import (
"github.com/dubbogo/grpc-go"
"github.com/dubbogo/grpc-go/metadata"

tripleCommon "github.com/dubbogo/triple/pkg/common"
tripleConstant "github.com/dubbogo/triple/pkg/common/constant"
triConfig "github.com/dubbogo/triple/pkg/config"
"github.com/dubbogo/triple/pkg/triple"
Expand Down Expand Up @@ -194,7 +194,13 @@ func (d *UnaryService) GetReqParamsInterfaces(methodName string) ([]interface{},
}

func (d *UnaryService) InvokeWithArgs(ctx context.Context, methodName string, arguments []interface{}) (interface{}, error) {
dubboAttachment, _ := ctx.Value(tripleConstant.TripleAttachement).(tripleCommon.DubboAttachment)
dubboAttachment := make(map[string]interface{})
md, ok := metadata.FromIncomingContext(ctx)
if ok {
for k := range md {
dubboAttachment[k] = md.Get(k)[0]
}
}
res := d.proxyImpl.Invoke(ctx, invocation.NewRPCInvocation(methodName, arguments, dubboAttachment))
return res, res.Error()
}
Expand Down