This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/develop by this push:
new 374bfaa49 chore: rename invocation (#2910)
374bfaa49 is described below
commit 374bfaa49bd381d6bfceb70ee06ce58367a91cf8
Author: marsevilspirit <[email protected]>
AuthorDate: Wed Jun 4 18:04:09 2025 +0800
chore: rename invocation (#2910)
* rename invocation
* fix comment
---
filter/active/filter.go | 16 ++++++-------
filter/auth/accesskey_storage.go | 2 +-
filter/auth/accesskey_storage_test.go | 6 ++---
filter/auth/default_authenticator.go | 42 +++++++++++++++++------------------
filter/generic/filter.go | 38 +++++++++++++++----------------
filter/generic/service_filter.go | 42 +++++++++++++++++------------------
filter/generic/service_filter_test.go | 24 ++++++++++----------
protocol/dubbo/opentracing.go | 4 ++--
protocol/dubbo3/dubbo3_invoker.go | 4 ++--
protocol/jsonrpc/jsonrpc_invoker.go | 14 ++++++------
protocol/rest/rest_invoker.go | 24 ++++++++++----------
protocol/triple/dubbo3_invoker.go | 10 ++++-----
proxy/proxy.go | 10 ++++-----
remoting/getty/opentracing.go | 4 ++--
14 files changed, 120 insertions(+), 120 deletions(-)
diff --git a/filter/active/filter.go b/filter/active/filter.go
index db4a613cd..ce72025ce 100644
--- a/filter/active/filter.go
+++ b/filter/active/filter.go
@@ -32,7 +32,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/filter"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
- invocation2 "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
"dubbo.apache.org/dubbo-go/v3/protocol/result"
)
@@ -62,21 +62,21 @@ func newActiveFilter() filter.Filter {
}
// Invoke starts to record the requests status
-func (f *activeFilter) Invoke(ctx context.Context, invoker base.Invoker,
invocation base.Invocation) result.Result {
-
invocation.(*invocation2.RPCInvocation).SetAttachment(dubboInvokeStartTime,
strconv.FormatInt(base.CurrentTimeMillis(), 10))
- base.BeginCount(invoker.GetURL(), invocation.MethodName())
- return invoker.Invoke(ctx, invocation)
+func (f *activeFilter) Invoke(ctx context.Context, invoker base.Invoker, inv
base.Invocation) result.Result {
+ inv.(*invocation.RPCInvocation).SetAttachment(dubboInvokeStartTime,
strconv.FormatInt(base.CurrentTimeMillis(), 10))
+ base.BeginCount(invoker.GetURL(), inv.MethodName())
+ return invoker.Invoke(ctx, inv)
}
// OnResponse update the active count base on the request result.
-func (f *activeFilter) OnResponse(ctx context.Context, result result.Result,
invoker base.Invoker, invocation base.Invocation) result.Result {
- startTime, err :=
strconv.ParseInt(invocation.(*invocation2.RPCInvocation).GetAttachmentWithDefaultValue(dubboInvokeStartTime,
"0"), 10, 64)
+func (f *activeFilter) OnResponse(ctx context.Context, result result.Result,
invoker base.Invoker, inv base.Invocation) result.Result {
+ startTime, err :=
strconv.ParseInt(inv.(*invocation.RPCInvocation).GetAttachmentWithDefaultValue(dubboInvokeStartTime,
"0"), 10, 64)
if err != nil {
result.SetError(err)
logger.Errorf("parse dubbo_invoke_start_time to int64 failed")
return result
}
elapsed := base.CurrentTimeMillis() - startTime
- base.EndCount(invoker.GetURL(), invocation.MethodName(), elapsed,
result.Error() == nil)
+ base.EndCount(invoker.GetURL(), inv.MethodName(), elapsed,
result.Error() == nil)
return result
}
diff --git a/filter/auth/accesskey_storage.go b/filter/auth/accesskey_storage.go
index 3351c0010..41beb186d 100644
--- a/filter/auth/accesskey_storage.go
+++ b/filter/auth/accesskey_storage.go
@@ -51,7 +51,7 @@ func newDefaultAccesskeyStorage() filter.AccessKeyStorage {
}
// GetAccessKeyPair retrieves AccessKeyPair from url by the key "accessKeyId"
and "secretAccessKey"
-func (storage *defaultAccesskeyStorage) GetAccessKeyPair(invocation
base.Invocation, url *common.URL) *filter.AccessKeyPair {
+func (storage *defaultAccesskeyStorage) GetAccessKeyPair(inv base.Invocation,
url *common.URL) *filter.AccessKeyPair {
return &filter.AccessKeyPair{
AccessKey: url.GetParam(constant.AccessKeyIDKey, ""),
SecretKey: url.GetParam(constant.SecretAccessKeyKey, ""),
diff --git a/filter/auth/accesskey_storage_test.go
b/filter/auth/accesskey_storage_test.go
index 77ffd0a31..897ab912d 100644
--- a/filter/auth/accesskey_storage_test.go
+++ b/filter/auth/accesskey_storage_test.go
@@ -29,7 +29,7 @@ import (
import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
- invocation2 "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
)
func TestDefaultAccesskeyStorage_GetAccesskeyPair(t *testing.T) {
@@ -37,9 +37,9 @@ func TestDefaultAccesskeyStorage_GetAccesskeyPair(t
*testing.T) {
common.WithParams(url.Values{}),
common.WithParamsValue(constant.SecretAccessKeyKey, "skey"),
common.WithParamsValue(constant.AccessKeyIDKey, "akey"))
- invocation := &invocation2.RPCInvocation{}
+ inv := &invocation.RPCInvocation{}
storage = &defaultAccesskeyStorage{}
- accesskeyPair := storage.GetAccessKeyPair(invocation, url)
+ accesskeyPair := storage.GetAccessKeyPair(inv, url)
assert.Equal(t, "skey", accesskeyPair.SecretKey)
assert.Equal(t, "akey", accesskeyPair.AccessKey)
}
diff --git a/filter/auth/default_authenticator.go
b/filter/auth/default_authenticator.go
index 47151f79d..ef83b4963 100644
--- a/filter/auth/default_authenticator.go
+++ b/filter/auth/default_authenticator.go
@@ -31,7 +31,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/filter"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
- invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
)
var (
@@ -56,35 +56,35 @@ func newDefaultAuthenticator() filter.Authenticator {
}
// Sign adds the signature to the invocation
-func (authenticator *defaultAuthenticator) Sign(invocation base.Invocation,
url *common.URL) error {
+func (authenticator *defaultAuthenticator) Sign(inv base.Invocation, url
*common.URL) error {
currentTimeMillis := strconv.Itoa(int(time.Now().Unix() * 1000))
consumer := url.GetParam(constant.ApplicationKey, "")
- accessKeyPair, err := getAccessKeyPair(invocation, url)
+ accessKeyPair, err := getAccessKeyPair(inv, url)
if err != nil {
return errors.New("get accesskey pair failed, cause: " +
err.Error())
}
- inv := invocation.(*invocation_impl.RPCInvocation)
- signature, err := getSignature(url, invocation,
accessKeyPair.SecretKey, currentTimeMillis)
+ rpcInv := inv.(*invocation.RPCInvocation)
+ signature, err := getSignature(url, inv, accessKeyPair.SecretKey,
currentTimeMillis)
if err != nil {
return err
}
- inv.SetAttachment(constant.RequestSignatureKey, signature)
- inv.SetAttachment(constant.RequestTimestampKey, currentTimeMillis)
- inv.SetAttachment(constant.AKKey, accessKeyPair.AccessKey)
- inv.SetAttachment(constant.Consumer, consumer)
+ rpcInv.SetAttachment(constant.RequestSignatureKey, signature)
+ rpcInv.SetAttachment(constant.RequestTimestampKey, currentTimeMillis)
+ rpcInv.SetAttachment(constant.AKKey, accessKeyPair.AccessKey)
+ rpcInv.SetAttachment(constant.Consumer, consumer)
return nil
}
// getSignature
// get signature by the metadata and params of the invocation
-func getSignature(url *common.URL, invocation base.Invocation, secrectKey
string, currentTime string) (string, error) {
+func getSignature(url *common.URL, inv base.Invocation, secrectKey string,
currentTime string) (string, error) {
requestString := fmt.Sprintf(constant.SignatureStringFormat,
- url.ColonSeparatedKey(), invocation.MethodName(), secrectKey,
currentTime)
+ url.ColonSeparatedKey(), inv.MethodName(), secrectKey,
currentTime)
var signature string
if parameterEncrypt :=
url.GetParamBool(constant.ParameterSignatureEnableKey, false); parameterEncrypt
{
var err error
- if signature, err = SignWithParams(invocation.Arguments(),
requestString, secrectKey); err != nil {
+ if signature, err = SignWithParams(inv.Arguments(),
requestString, secrectKey); err != nil {
// TODO
return "", errors.New("sign the request with params
failed, cause:" + err.Error())
}
@@ -96,23 +96,23 @@ func getSignature(url *common.URL, invocation
base.Invocation, secrectKey string
}
// Authenticate verifies whether the signature sent by the requester is correct
-func (authenticator *defaultAuthenticator) Authenticate(invocation
base.Invocation, url *common.URL) error {
- accessKeyId := invocation.GetAttachmentWithDefaultValue(constant.AKKey,
"")
+func (authenticator *defaultAuthenticator) Authenticate(inv base.Invocation,
url *common.URL) error {
+ accessKeyId := inv.GetAttachmentWithDefaultValue(constant.AKKey, "")
- requestTimestamp :=
invocation.GetAttachmentWithDefaultValue(constant.RequestTimestampKey, "")
- originSignature :=
invocation.GetAttachmentWithDefaultValue(constant.RequestSignatureKey, "")
- consumer := invocation.GetAttachmentWithDefaultValue(constant.Consumer,
"")
+ requestTimestamp :=
inv.GetAttachmentWithDefaultValue(constant.RequestTimestampKey, "")
+ originSignature :=
inv.GetAttachmentWithDefaultValue(constant.RequestSignatureKey, "")
+ consumer := inv.GetAttachmentWithDefaultValue(constant.Consumer, "")
if IsEmpty(accessKeyId, false) || IsEmpty(consumer, false) ||
IsEmpty(requestTimestamp, false) || IsEmpty(originSignature,
false) {
return errors.New("failed to authenticate your ak/sk, maybe the
consumer has not enabled the auth")
}
- accessKeyPair, err := getAccessKeyPair(invocation, url)
+ accessKeyPair, err := getAccessKeyPair(inv, url)
if err != nil {
return errors.New("failed to authenticate , can't load the
accessKeyPair")
}
- computeSignature, err := getSignature(url, invocation,
accessKeyPair.SecretKey, requestTimestamp)
+ computeSignature, err := getSignature(url, inv,
accessKeyPair.SecretKey, requestTimestamp)
if err != nil {
return err
}
@@ -122,9 +122,9 @@ func (authenticator *defaultAuthenticator)
Authenticate(invocation base.Invocati
return nil
}
-func getAccessKeyPair(invocation base.Invocation, url *common.URL)
(*filter.AccessKeyPair, error) {
+func getAccessKeyPair(inv base.Invocation, url *common.URL)
(*filter.AccessKeyPair, error) {
accesskeyStorage :=
extension.GetAccessKeyStorages(url.GetParam(constant.AccessKeyStorageKey,
constant.DefaultAccessKeyStorage))
- accessKeyPair := accesskeyStorage.GetAccessKeyPair(invocation, url)
+ accessKeyPair := accesskeyStorage.GetAccessKeyPair(inv, url)
if accessKeyPair == nil || IsEmpty(accessKeyPair.AccessKey, false) ||
IsEmpty(accessKeyPair.SecretKey, true) {
return nil, errors.New("accessKeyId or secretAccessKey not
found")
} else {
diff --git a/filter/generic/filter.go b/filter/generic/filter.go
index 7ad08bb35..c3a0c653e 100644
--- a/filter/generic/filter.go
+++ b/filter/generic/filter.go
@@ -34,7 +34,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/filter"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
- invocation2 "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
"dubbo.apache.org/dubbo-go/v3/protocol/result"
)
@@ -60,21 +60,21 @@ func newGenericFilter() filter.Filter {
}
// Invoke turns the parameters to map for generic method
-func (f *genericFilter) Invoke(ctx context.Context, invoker base.Invoker,
invocation base.Invocation) result.Result {
- if isCallingToGenericService(invoker, invocation) {
+func (f *genericFilter) Invoke(ctx context.Context, invoker base.Invoker, inv
base.Invocation) result.Result {
+ if isCallingToGenericService(invoker, inv) {
- mtdname := invocation.MethodName()
- oldargs := invocation.Arguments()
+ mtdName := inv.MethodName()
+ oldArgs := inv.Arguments()
- types := make([]string, 0, len(oldargs))
- args := make([]hessian.Object, 0, len(oldargs))
+ types := make([]string, 0, len(oldArgs))
+ args := make([]hessian.Object, 0, len(oldArgs))
// get generic info from attachments of invocation, the default
value is "true"
- generic :=
invocation.GetAttachmentWithDefaultValue(constant.GenericKey,
constant.GenericSerializationDefault)
+ generic :=
inv.GetAttachmentWithDefaultValue(constant.GenericKey,
constant.GenericSerializationDefault)
// get generalizer according to value in the `generic`
g := getGeneralizer(generic)
- for _, arg := range oldargs {
+ for _, arg := range oldArgs {
// use the default generalizer(MapGeneralizer)
typ, err := g.GetType(arg)
if err != nil {
@@ -83,27 +83,27 @@ func (f *genericFilter) Invoke(ctx context.Context, invoker
base.Invoker, invoca
obj, err := g.Generalize(arg)
if err != nil {
logger.Errorf("generalization failed, %v", err)
- return invoker.Invoke(ctx, invocation)
+ return invoker.Invoke(ctx, inv)
}
types = append(types, typ)
args = append(args, obj)
}
// construct a new invocation for generic call
- newargs := []any{
- mtdname,
+ newArgs := []any{
+ mtdName,
types,
args,
}
- newivc := invocation2.NewRPCInvocation(constant.Generic,
newargs, invocation.Attachments())
- newivc.SetReply(invocation.Reply())
- newivc.Attachments()[constant.GenericKey] =
invoker.GetURL().GetParam(constant.GenericKey, "")
+ newIvc := invocation.NewRPCInvocation(constant.Generic,
newArgs, inv.Attachments())
+ newIvc.SetReply(inv.Reply())
+ newIvc.Attachments()[constant.GenericKey] =
invoker.GetURL().GetParam(constant.GenericKey, "")
- return invoker.Invoke(ctx, newivc)
- } else if isMakingAGenericCall(invoker, invocation) {
- invocation.Attachments()[constant.GenericKey] =
invoker.GetURL().GetParam(constant.GenericKey, "")
+ return invoker.Invoke(ctx, newIvc)
+ } else if isMakingAGenericCall(invoker, inv) {
+ inv.Attachments()[constant.GenericKey] =
invoker.GetURL().GetParam(constant.GenericKey, "")
}
- return invoker.Invoke(ctx, invocation)
+ return invoker.Invoke(ctx, inv)
}
// OnResponse dummy process, returns the result directly
diff --git a/filter/generic/service_filter.go b/filter/generic/service_filter.go
index bc2561483..16925f771 100644
--- a/filter/generic/service_filter.go
+++ b/filter/generic/service_filter.go
@@ -36,7 +36,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/filter"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
- invocation2 "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
"dubbo.apache.org/dubbo-go/v3/protocol/result"
)
@@ -60,68 +60,68 @@ func newGenericServiceFilter() filter.Filter {
}
return serviceGeneric
}
-func (f *genericServiceFilter) Invoke(ctx context.Context, invoker
base.Invoker, invocation base.Invocation) result.Result {
- if !invocation.IsGenericInvocation() {
- return invoker.Invoke(ctx, invocation)
+func (f *genericServiceFilter) Invoke(ctx context.Context, invoker
base.Invoker, inv base.Invocation) result.Result {
+ if !inv.IsGenericInvocation() {
+ return invoker.Invoke(ctx, inv)
}
// get real invocation info from the generic invocation
- mtdname := invocation.Arguments()[0].(string)
+ mtdName := inv.Arguments()[0].(string)
// types are not required in dubbo-go, for dubbo-go client to dubbo-go
server, types could be nil
- types := invocation.Arguments()[1]
- args := invocation.Arguments()[2].([]hessian.Object)
+ types := inv.Arguments()[1]
+ args := inv.Arguments()[2].([]hessian.Object)
logger.Debugf(`received a generic invocation:
MethodName: %s,
Types: %s,
Args: %s
- `, mtdname, types, args)
+ `, mtdName, types, args)
// get the type of the argument
ivkUrl := invoker.GetURL()
svc := common.ServiceMap.GetServiceByServiceKey(ivkUrl.Protocol,
ivkUrl.ServiceKey())
- method := svc.Method()[mtdname]
+ method := svc.Method()[mtdName]
if method == nil {
return &result.RPCResult{
- Err: perrors.Errorf("\"%s\" method is not found,
service key: %s", mtdname, ivkUrl.ServiceKey()),
+ Err: perrors.Errorf("\"%s\" method is not found,
service key: %s", mtdName, ivkUrl.ServiceKey()),
}
}
argsType := method.ArgsType()
// get generic info from attachments of invocation, the default value
is "true"
- generic :=
invocation.GetAttachmentWithDefaultValue(constant.GenericKey,
constant.GenericSerializationDefault)
+ generic := inv.GetAttachmentWithDefaultValue(constant.GenericKey,
constant.GenericSerializationDefault)
// get generalizer according to value in the `generic`
g := getGeneralizer(generic)
if len(args) != len(argsType) {
return &result.RPCResult{
- Err: perrors.Errorf("the number of args(=%d) is not
matched with \"%s\" method", len(args), mtdname),
+ Err: perrors.Errorf("the number of args(=%d) is not
matched with \"%s\" method", len(args), mtdName),
}
}
// realize
- newargs := make([]any, len(argsType))
+ newArgs := make([]any, len(argsType))
for i := 0; i < len(argsType); i++ {
- newarg, err := g.Realize(args[i], argsType[i])
+ newArg, err := g.Realize(args[i], argsType[i])
if err != nil {
return &result.RPCResult{
Err: perrors.Errorf("realization failed, %v",
err),
}
}
- newargs[i] = newarg
+ newArgs[i] = newArg
}
// build a normal invocation
- newivc := invocation2.NewRPCInvocation(mtdname, newargs,
invocation.Attachments())
- newivc.SetReply(invocation.Reply())
+ newIvc := invocation.NewRPCInvocation(mtdName, newArgs,
inv.Attachments())
+ newIvc.SetReply(inv.Reply())
- return invoker.Invoke(ctx, newivc)
+ return invoker.Invoke(ctx, newIvc)
}
-func (f *genericServiceFilter) OnResponse(_ context.Context, result
result.Result, _ base.Invoker, invocation base.Invocation) result.Result {
- if invocation.IsGenericInvocation() && result.Result() != nil {
+func (f *genericServiceFilter) OnResponse(_ context.Context, result
result.Result, _ base.Invoker, inv base.Invocation) result.Result {
+ if inv.IsGenericInvocation() && result.Result() != nil {
// get generic info from attachments of invocation, the default
value is "true"
- generic :=
invocation.GetAttachmentWithDefaultValue(constant.GenericKey,
constant.GenericSerializationDefault)
+ generic :=
inv.GetAttachmentWithDefaultValue(constant.GenericKey,
constant.GenericSerializationDefault)
// get generalizer according to value in the `generic`
g := getGeneralizer(generic)
diff --git a/filter/generic/service_filter_test.go
b/filter/generic/service_filter_test.go
index 27bec72a8..5fa210823 100644
--- a/filter/generic/service_filter_test.go
+++ b/filter/generic/service_filter_test.go
@@ -79,17 +79,17 @@ func TestServiceFilter_Invoke(t *testing.T) {
mockInvoker := mock.NewMockInvoker(ctrl)
// methodName is not "$invoke"
- invocation1 := invocation.NewRPCInvocation("test", nil, nil)
- mockInvoker.EXPECT().Invoke(gomock.Any(), gomock.Eq(invocation1))
- _ = filter.Invoke(context.Background(), mockInvoker, invocation1)
+ inv1 := invocation.NewRPCInvocation("test", nil, nil)
+ mockInvoker.EXPECT().Invoke(gomock.Any(), gomock.Eq(inv1))
+ _ = filter.Invoke(context.Background(), mockInvoker, inv1)
// arguments are nil
- invocation2 := invocation.NewRPCInvocation(constant.Generic, nil, nil)
- mockInvoker.EXPECT().Invoke(gomock.Any(), gomock.Eq(invocation2))
- _ = filter.Invoke(context.Background(), mockInvoker, invocation2)
+ inv2 := invocation.NewRPCInvocation(constant.Generic, nil, nil)
+ mockInvoker.EXPECT().Invoke(gomock.Any(), gomock.Eq(inv2))
+ _ = filter.Invoke(context.Background(), mockInvoker, inv2)
// the number of arguments is not 3
- invocation3 := invocation.NewRPCInvocation(constant.Generic,
[]any{"hello"}, nil)
- mockInvoker.EXPECT().Invoke(gomock.Any(), gomock.Eq(invocation3))
- _ = filter.Invoke(context.Background(), mockInvoker, invocation3)
+ inv3 := invocation.NewRPCInvocation(constant.Generic, []any{"hello"},
nil)
+ mockInvoker.EXPECT().Invoke(gomock.Any(), gomock.Eq(inv3))
+ _ = filter.Invoke(context.Background(), mockInvoker, inv3)
// hello service
service := &MockHelloService{}
@@ -148,9 +148,9 @@ func TestServiceFilter_Invoke(t *testing.T) {
// })
mockInvoker.EXPECT().Invoke(gomock.Any(), gomock.All(
- gomock.Not(invocation1),
- gomock.Not(invocation2),
- gomock.Not(invocation3),
+ gomock.Not(inv1),
+ gomock.Not(inv2),
+ gomock.Not(inv3),
)).DoAndReturn(
func(ctx context.Context, invocation base.Invocation)
result.Result {
switch invocation.MethodName() {
diff --git a/protocol/dubbo/opentracing.go b/protocol/dubbo/opentracing.go
index cc0222bd0..69c77fad9 100644
--- a/protocol/dubbo/opentracing.go
+++ b/protocol/dubbo/opentracing.go
@@ -22,10 +22,10 @@ import (
)
import (
- invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
)
-func injectTraceCtx(currentSpan opentracing.Span, inv
*invocation_impl.RPCInvocation) error {
+func injectTraceCtx(currentSpan opentracing.Span, inv
*invocation.RPCInvocation) error {
// inject opentracing ctx
traceAttachments := filterContext(inv.Attachments())
carrier := opentracing.TextMapCarrier(traceAttachments)
diff --git a/protocol/dubbo3/dubbo3_invoker.go
b/protocol/dubbo3/dubbo3_invoker.go
index aa076bbad..54bdfd26c 100644
--- a/protocol/dubbo3/dubbo3_invoker.go
+++ b/protocol/dubbo3/dubbo3_invoker.go
@@ -43,7 +43,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
- invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
"dubbo.apache.org/dubbo-go/v3/protocol/result"
)
@@ -235,7 +235,7 @@ func (di *DubboInvoker) Invoke(ctx context.Context,
invocation base.Invocation)
}
// get timeout including methodConfig
-func (di *DubboInvoker) getTimeout(invocation *invocation_impl.RPCInvocation)
time.Duration {
+func (di *DubboInvoker) getTimeout(invocation *invocation.RPCInvocation)
time.Duration {
timeout :=
di.GetURL().GetParam(strings.Join([]string{constant.MethodKeys,
invocation.MethodName(), constant.TimeoutKey}, "."), "")
if len(timeout) != 0 {
if t, err := time.ParseDuration(timeout); err == nil {
diff --git a/protocol/jsonrpc/jsonrpc_invoker.go
b/protocol/jsonrpc/jsonrpc_invoker.go
index a9d8694ba..a707f7b22 100644
--- a/protocol/jsonrpc/jsonrpc_invoker.go
+++ b/protocol/jsonrpc/jsonrpc_invoker.go
@@ -29,7 +29,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
- invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
"dubbo.apache.org/dubbo-go/v3/protocol/result"
)
@@ -48,20 +48,20 @@ func NewJsonrpcInvoker(url *common.URL, client *HTTPClient)
*JsonrpcInvoker {
}
// Invoke the JSON RPC invocation and return result.
-func (ji *JsonrpcInvoker) Invoke(ctx context.Context, invocation
base.Invocation) result.Result {
+func (ji *JsonrpcInvoker) Invoke(ctx context.Context, inv base.Invocation)
result.Result {
var result result.RPCResult
- inv := invocation.(*invocation_impl.RPCInvocation)
+ rpcInv := inv.(*invocation.RPCInvocation)
url := ji.GetURL()
- req := ji.client.NewRequest(url, inv.MethodName(), inv.Arguments())
+ req := ji.client.NewRequest(url, rpcInv.MethodName(),
rpcInv.Arguments())
ctxNew := context.WithValue(ctx, constant.DubboGoCtxKey,
map[string]string{
"X-Proxy-ID": "dubbogo",
"X-Services": url.Path,
- "X-Method": inv.MethodName(),
+ "X-Method": rpcInv.MethodName(),
})
- result.Err = ji.client.Call(ctxNew, url, req, inv.Reply())
+ result.Err = ji.client.Call(ctxNew, url, req, rpcInv.Reply())
if result.Err == nil {
- result.Rest = inv.Reply()
+ result.Rest = rpcInv.Reply()
}
logger.Debugf("result.Err: %v, result.Rest: %v", result.Err,
result.Rest)
diff --git a/protocol/rest/rest_invoker.go b/protocol/rest/rest_invoker.go
index 46881760b..87a39a010 100644
--- a/protocol/rest/rest_invoker.go
+++ b/protocol/rest/rest_invoker.go
@@ -30,7 +30,7 @@ import (
import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
- invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
"dubbo.apache.org/dubbo-go/v3/protocol/rest/client"
"dubbo.apache.org/dubbo-go/v3/protocol/rest/config"
"dubbo.apache.org/dubbo-go/v3/protocol/result"
@@ -53,9 +53,9 @@ func NewRestInvoker(url *common.URL, client
*client.RestClient, restMethodConfig
}
// Invoke is used to call service method by invocation
-func (ri *RestInvoker) Invoke(ctx context.Context, invocation base.Invocation)
result.Result {
- inv := invocation.(*invocation_impl.RPCInvocation)
- methodConfig := ri.restMethodConfigMap[inv.MethodName()]
+func (ri *RestInvoker) Invoke(ctx context.Context, inv base.Invocation)
result.Result {
+ rpcInv := inv.(*invocation.RPCInvocation)
+ methodConfig := ri.restMethodConfigMap[rpcInv.MethodName()]
var (
result result.RPCResult
body any
@@ -65,23 +65,23 @@ func (ri *RestInvoker) Invoke(ctx context.Context,
invocation base.Invocation) r
err error
)
if methodConfig == nil {
- result.Err = perrors.Errorf("[RestInvoker] Rest methodConfig:%s
is nil", inv.MethodName())
+ result.Err = perrors.Errorf("[RestInvoker] Rest methodConfig:%s
is nil", rpcInv.MethodName())
return &result
}
- if pathParams, err = restStringMapTransform(methodConfig.PathParamsMap,
inv.Arguments()); err != nil {
+ if pathParams, err = restStringMapTransform(methodConfig.PathParamsMap,
rpcInv.Arguments()); err != nil {
result.Err = err
return &result
}
- if queryParams, err =
restStringMapTransform(methodConfig.QueryParamsMap, inv.Arguments()); err !=
nil {
+ if queryParams, err =
restStringMapTransform(methodConfig.QueryParamsMap, rpcInv.Arguments()); err !=
nil {
result.Err = err
return &result
}
- if header, err = getRestHttpHeader(methodConfig, inv.Arguments()); err
!= nil {
+ if header, err = getRestHttpHeader(methodConfig, rpcInv.Arguments());
err != nil {
result.Err = err
return &result
}
- if len(inv.Arguments()) > methodConfig.Body && methodConfig.Body >= 0 {
- body = inv.Arguments()[methodConfig.Body]
+ if len(rpcInv.Arguments()) > methodConfig.Body && methodConfig.Body >=
0 {
+ body = rpcInv.Arguments()[methodConfig.Body]
}
req := &client.RestClientRequest{
Location: ri.GetURL().Location,
@@ -92,9 +92,9 @@ func (ri *RestInvoker) Invoke(ctx context.Context, invocation
base.Invocation) r
Body: body,
Header: header,
}
- result.Err = ri.client.Do(req, inv.Reply())
+ result.Err = ri.client.Do(req, rpcInv.Reply())
if result.Err == nil {
- result.Rest = inv.Reply()
+ result.Rest = rpcInv.Reply()
}
return &result
}
diff --git a/protocol/triple/dubbo3_invoker.go
b/protocol/triple/dubbo3_invoker.go
index 4cfeebc91..9173b6efc 100644
--- a/protocol/triple/dubbo3_invoker.go
+++ b/protocol/triple/dubbo3_invoker.go
@@ -43,7 +43,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
- invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
"dubbo.apache.org/dubbo-go/v3/protocol/result"
)
@@ -240,17 +240,17 @@ func (di *DubboInvoker) Invoke(ctx context.Context,
invocation base.Invocation)
}
// get timeout including methodConfig
-func (di *DubboInvoker) getTimeout(invocation *invocation_impl.RPCInvocation)
time.Duration {
- timeout :=
di.GetURL().GetParam(strings.Join([]string{constant.MethodKeys,
invocation.MethodName(), constant.TimeoutKey}, "."), "")
+func (di *DubboInvoker) getTimeout(inv *invocation.RPCInvocation)
time.Duration {
+ timeout :=
di.GetURL().GetParam(strings.Join([]string{constant.MethodKeys,
inv.MethodName(), constant.TimeoutKey}, "."), "")
if len(timeout) != 0 {
if t, err := time.ParseDuration(timeout); err == nil {
// config timeout into attachment
- invocation.SetAttachment(constant.TimeoutKey,
strconv.Itoa(int(t.Milliseconds())))
+ inv.SetAttachment(constant.TimeoutKey,
strconv.Itoa(int(t.Milliseconds())))
return t
}
}
// set timeout into invocation at method level
- invocation.SetAttachment(constant.TimeoutKey,
strconv.Itoa(int(di.timeout.Milliseconds())))
+ inv.SetAttachment(constant.TimeoutKey,
strconv.Itoa(int(di.timeout.Milliseconds())))
return di.timeout
}
diff --git a/proxy/proxy.go b/proxy/proxy.go
index aa027ec99..4c8afadbd 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -37,7 +37,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/protocol/base"
- invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
)
// nolint
@@ -125,7 +125,7 @@ func DefaultProxyImplementFunc(p *Proxy, v
common.RPCService) {
return func(in []reflect.Value) []reflect.Value {
var (
err error
- inv *invocation_impl.RPCInvocation
+ inv *invocation.RPCInvocation
inIArr []any
inVArr []reflect.Value
reply reflect.Value
@@ -176,9 +176,9 @@ func DefaultProxyImplementFunc(p *Proxy, v
common.RPCService) {
}
}
- inv =
invocation_impl.NewRPCInvocationWithOptions(invocation_impl.WithMethodName(methodName),
- invocation_impl.WithArguments(inIArr),
- invocation_impl.WithCallBack(p.callback),
invocation_impl.WithParameterValues(inVArr))
+ inv =
invocation.NewRPCInvocationWithOptions(invocation.WithMethodName(methodName),
+ invocation.WithArguments(inIArr),
+ invocation.WithCallBack(p.callback),
invocation.WithParameterValues(inVArr))
if !replyEmptyFlag {
inv.SetReply(reply.Interface())
}
diff --git a/remoting/getty/opentracing.go b/remoting/getty/opentracing.go
index 22c6b1d67..e2e7b7b3d 100644
--- a/remoting/getty/opentracing.go
+++ b/remoting/getty/opentracing.go
@@ -22,10 +22,10 @@ import (
)
import (
- invocation_impl "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+ "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
)
-func injectTraceCtx(currentSpan opentracing.Span, inv
*invocation_impl.RPCInvocation) error {
+func injectTraceCtx(currentSpan opentracing.Span, inv
*invocation.RPCInvocation) error {
// inject opentracing ctx
traceAttachments := filterContext(inv.Attachments())
carrier := opentracing.TextMapCarrier(traceAttachments)
