github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-02 16:28:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix client side in zeromicro#2109 (zeromicro#2116) (#2659)

Browse Source 
* fix: fix client side in zeromicro#2109 (zeromicro#2116)

* fix: fix client side in zeromicro#2109 (zeromicro#2116)

* fix: fix client side in zeromicro#2109 (zeromicro#2116)
This commit is contained in:
benqi 2022-12-04 00:25:52 +08:00 committed by GitHub
parent 9f7f94b673
commit 3604659027
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zrpc/client.go
View File

@ -90,6 +90,11 @@ func (rc *RpcClient) Conn() *grpc.ClientConn {
return rc.client.Conn()
}
// DontLogClientContentForMethod disable logging content for given method.
func DontLogClientContentForMethod(method string) {
clientinterceptors.DontLogContentForMethod(method)
}
// SetClientSlowThreshold sets the slow threshold on client side.
func SetClientSlowThreshold(threshold time.Duration) {
clientinterceptors.SetSlowThreshold(threshold)

1
zrpc/client_test.go
View File

@ -125,6 +125,7 @@ func TestDepositServer_Deposit(t *testing.T) {
tarConfClient,
targetClient,
}
DontLogClientContentForMethod("foo")
SetClientSlowThreshold(time.Second)
for _, tt := range tests {

30
zrpc/internal/clientinterceptors/durationinterceptor.go
View File

@ -3,8 +3,10 @@ package clientinterceptors
import (
"context"
"path"
"sync"
"time"
"github.com/zeromicro/go-zero/core/lang"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/syncx"
"github.com/zeromicro/go-zero/core/timex"
@ -13,7 +15,10 @@ import (
const defaultSlowThreshold = time.Millisecond * 500
var slowThreshold = syncx.ForAtomicDuration(defaultSlowThreshold)
var (
notLoggingContentMethods sync.Map
slowThreshold = syncx.ForAtomicDuration(defaultSlowThreshold)
)
// DurationInterceptor is an interceptor that logs the processing time.
func DurationInterceptor(ctx context.Context, method string, req, reply interface{},
@ -22,19 +27,34 @@ func DurationInterceptor(ctx context.Context, method string, req, reply interfac
start := timex.Now()
err := invoker(ctx, method, req, reply, cc, opts...)
if err != nil {
logx.WithContext(ctx).WithDuration(timex.Since(start)).Errorf("fail - %s - %v - %s",
serverName, req, err.Error())
logger := logx.WithContext(ctx).WithDuration(timex.Since(start))
_, ok := notLoggingContentMethods.Load(method)
if ok {
logger.Errorf("fail - %s - %s", serverName, err.Error())
} else {
logger.Errorf("fail - %s - %v - %s", serverName, req, err.Error())
}
} else {
elapsed := timex.Since(start)
if elapsed > slowThreshold.Load() {
logx.WithContext(ctx).WithDuration(elapsed).Slowf("[RPC] ok - slowcall - %s - %v - %v",
serverName, req, reply)
logger := logx.WithContext(ctx).WithDuration(elapsed)
_, ok := notLoggingContentMethods.Load(method)
if ok {
logger.Slowf("[RPC] ok - slowcall - %s", serverName)
} else {
logger.Slowf("[RPC] ok - slowcall - %s - %v - %v", serverName, req, reply)
}
}
}
return err
}
// DontLogContentForMethod disable logging content for given method.
func DontLogContentForMethod(method string) {
notLoggingContentMethods.Store(method, lang.Placeholder)
}
// SetSlowThreshold sets the slow threshold.
func SetSlowThreshold(threshold time.Duration) {
slowThreshold.Set(threshold)

1
zrpc/internal/clientinterceptors/durationinterceptor_test.go
View File

@ -24,6 +24,7 @@ func TestDurationInterceptor(t *testing.T) {
err: errors.New("mock"),
},
}
DontLogContentForMethod("/foo")
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
cc := new(grpc.ClientConn)