Skip to content

Changed the GRPC client context so that the logger can be reused inside other interceptors #518

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changed the GRPC client context so that the logger can be reused inside other interceptors #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions logging/logrus/client_interceptors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ func UnaryClientInterceptor(entry *logrus.Entry, opts ...Option) grpc.UnaryClien
return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
fields := newClientLoggerFields(ctx, method)
startTime := time.Now()
err := invoker(ctx, method, req, reply, cc, opts...)
newCtx := ctxlogrus.ToContext(ctx, entry.WithFields(fields))
err := invoker(newCtx, method, req, reply, cc, opts...)
logFinalClientLine(newCtx, o, startTime, err, "finished client unary call")
return err
}
Expand All @@ -32,8 +32,8 @@ func StreamClientInterceptor(entry *logrus.Entry, opts ...Option) grpc.StreamCli
return func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
fields := newClientLoggerFields(ctx, method)
startTime := time.Now()
clientStream, err := streamer(ctx, desc, cc, method, opts...)
newCtx := ctxlogrus.ToContext(ctx, entry.WithFields(fields))
clientStream, err := streamer(newCtx, desc, cc, method, opts...)
logFinalClientLine(newCtx, o, startTime, err, "finished client streaming call")
return clientStream, err
}
Expand Down
4 changes: 2 additions & 2 deletions logging/zap/client_interceptors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ func UnaryClientInterceptor(logger *zap.Logger, opts ...Option) grpc.UnaryClient
return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
fields := newClientLoggerFields(ctx, method)
startTime := time.Now()
err := invoker(ctx, method, req, reply, cc, opts...)
newCtx := ctxzap.ToContext(ctx, logger.With(fields...))
err := invoker(newCtx, method, req, reply, cc, opts...)
logFinalClientLine(newCtx, o, startTime, err, "finished client unary call")
return err
}
Expand All @@ -38,8 +38,8 @@ func StreamClientInterceptor(logger *zap.Logger, opts ...Option) grpc.StreamClie
return func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
fields := newClientLoggerFields(ctx, method)
startTime := time.Now()
clientStream, err := streamer(ctx, desc, cc, method, opts...)
newCtx := ctxzap.ToContext(ctx, logger.With(fields...))
clientStream, err := streamer(newCtx, desc, cc, method, opts...)
logFinalClientLine(newCtx, o, startTime, err, "finished client streaming call")
return clientStream, err
}
Expand Down