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.

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

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

Merged
merged 3 commits into from Dec 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions zrpc/client.go
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions zrpc/client_test.go
Expand Up @@ -125,6 +125,7 @@ func TestDepositServer_Deposit(t *testing.T) {
tarConfClient,
targetClient,
}
DontLogClientContentForMethod("foo")
SetClientSlowThreshold(time.Second)

for _, tt := range tests {
Expand Down
30 changes: 25 additions & 5 deletions zrpc/internal/clientinterceptors/durationinterceptor.go
Expand Up @@ -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"
Expand All @@ -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{},
Expand All @@ -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)
Expand Down
Expand Up @@ -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)
Expand Down