adapter: Carry invocation arguments in Dubbo filters (#186)

sczyh30 · web-flow · commit 1f1c71b99daa · 2020-07-24T20:04:37.000+08:00
Signed-off-by: Eric Zhao &lt;sczyh16@gmail.com&gt;
diff --git a/adapter/dubbo/consumer_filter.go b/adapter/dubbo/consumer_filter.go
@@ -31,7 +31,8 @@ func (d *consumerFilter) Invoke(ctx context.Context, invoker protocol.Invoker, i
 	}
 	ctx = context.WithValue(ctx, InterfaceEntryKey, interfaceEntry)
 
-	methodEntry, b = sentinel.Entry(methodResourceName, sentinel.WithResourceType(base.ResTypeRPC), sentinel.WithTrafficType(base.Outbound), sentinel.WithArgs(invocation.Attachments()))
+	methodEntry, b = sentinel.Entry(methodResourceName, sentinel.WithResourceType(base.ResTypeRPC),
+		sentinel.WithTrafficType(base.Outbound), sentinel.WithArgs(invocation.Arguments()...))
 	if b != nil {
 		// method blocked
 		return consumerDubboFallback(ctx, invoker, invocation, b)
diff --git a/adapter/dubbo/provider_filter.go b/adapter/dubbo/provider_filter.go
@@ -30,7 +30,8 @@ func (d *providerFilter) Invoke(ctx context.Context, invoker protocol.Invoker, i
 	}
 	ctx = context.WithValue(ctx, InterfaceEntryKey, interfaceEntry)
 
-	methodEntry, b = sentinel.Entry(methodResourceName, sentinel.WithResourceType(base.ResTypeRPC), sentinel.WithTrafficType(base.Inbound), sentinel.WithArgs(invocation.Attachments()))
+	methodEntry, b = sentinel.Entry(methodResourceName, sentinel.WithResourceType(base.ResTypeRPC),
+		sentinel.WithTrafficType(base.Inbound), sentinel.WithArgs(invocation.Arguments()...))
 	if b != nil {
 		// method blocked
 		return providerDubboFallback(ctx, invoker, invocation, b)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ func (d *consumerFilter) Invoke(ctx context.Context, invoker protocol.Invoker, i`
`31`	`31`	`}`
`32`	`32`	`ctx = context.WithValue(ctx, InterfaceEntryKey, interfaceEntry)`
`33`	`33`
`34`		`- methodEntry, b = sentinel.Entry(methodResourceName, sentinel.WithResourceType(base.ResTypeRPC), sentinel.WithTrafficType(base.Outbound), sentinel.WithArgs(invocation.Attachments()))`
	`34`	`+ methodEntry, b = sentinel.Entry(methodResourceName, sentinel.WithResourceType(base.ResTypeRPC),`
	`35`	`+ sentinel.WithTrafficType(base.Outbound), sentinel.WithArgs(invocation.Arguments()...))`
`35`	`36`	`if b != nil {`
`36`	`37`	`// method blocked`
`37`	`38`	`return consumerDubboFallback(ctx, invoker, invocation, b)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ func (d *providerFilter) Invoke(ctx context.Context, invoker protocol.Invoker, i`
`30`	`30`	`}`
`31`	`31`	`ctx = context.WithValue(ctx, InterfaceEntryKey, interfaceEntry)`
`32`	`32`
`33`		`- methodEntry, b = sentinel.Entry(methodResourceName, sentinel.WithResourceType(base.ResTypeRPC), sentinel.WithTrafficType(base.Inbound), sentinel.WithArgs(invocation.Attachments()))`
	`33`	`+ methodEntry, b = sentinel.Entry(methodResourceName, sentinel.WithResourceType(base.ResTypeRPC),`
	`34`	`+ sentinel.WithTrafficType(base.Inbound), sentinel.WithArgs(invocation.Arguments()...))`
`34`	`35`	`if b != nil {`
`35`	`36`	`// method blocked`
`36`	`37`	`return providerDubboFallback(ctx, invoker, invocation, b)`