Skip to content

Commit 3297ec3

Browse files
authored
enhancement: Log client address for gRPC calls (#31)
Signed-off-by: jannfis <[email protected]>
1 parent 5be3d2a commit 3297ec3

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

principal/logging.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66

77
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
8+
"github.com/jannfis/argocd-agent/internal/grpcutil"
89
"github.com/sirupsen/logrus"
910
"google.golang.org/grpc"
1011
)
@@ -36,14 +37,20 @@ func InterceptorLogger(l logrus.FieldLogger) logging.Logger {
3637

3738
func unaryRequestLogger() grpc.UnaryServerInterceptor {
3839
return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) {
39-
log().WithField("method", info.FullMethod).Debug("Processing unary gRPC request")
40+
log().WithFields(logrus.Fields{
41+
"method": info.FullMethod,
42+
"client_addr": grpcutil.AddressFromContext(ctx),
43+
}).Debug("Processing unary gRPC request")
4044
return handler(ctx, req)
4145
}
4246
}
4347

4448
func streamRequestLogger() grpc.StreamServerInterceptor {
4549
return func(srv interface{}, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
46-
log().WithField("method", info.FullMethod).Debug("Processing streaming gRPC request")
50+
log().WithFields(logrus.Fields{
51+
"method": info.FullMethod,
52+
"client_addr": grpcutil.AddressFromContext(ss.Context()),
53+
}).Debug("Processing unary gRPC request")
4754
return handler(srv, ss)
4855
}
4956
}

0 commit comments

Comments
 (0)