diff --git a/logging/logrus/client_interceptors.go b/logging/logrus/client_interceptors.go index a5acd5554..2f361efec 100644 --- a/logging/logrus/client_interceptors.go +++ b/logging/logrus/client_interceptors.go @@ -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 } @@ -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 } diff --git a/logging/zap/client_interceptors.go b/logging/zap/client_interceptors.go index de80c1cc0..da857a300 100644 --- a/logging/zap/client_interceptors.go +++ b/logging/zap/client_interceptors.go @@ -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 } @@ -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 }