middleware/methodtype: Inject logger instead of using global one

We're using the global logging instance provided by the logrus package,
which is discouraged. Inject a logger such that we can use a properly
configured logger instead.

2 files changed, 8 insertions, 8 deletions

diff --git a/internal/praefect/middleware/methodtype.go b/internal/praefect/middleware/methodtype.go
index a13278831..bd0d4b11a 100644
--- a/internal/praefect/middleware/methodtype.go
+++ b/internal/praefect/middleware/methodtype.go
@@ -10,9 +10,9 @@ import (
 )
 
 // MethodTypeUnaryInterceptor returns a Unary Interceptor that records the method type of incoming RPC requests
-func MethodTypeUnaryInterceptor(r *protoregistry.Registry) grpc.UnaryServerInterceptor {
+func MethodTypeUnaryInterceptor(r *protoregistry.Registry, logger logrus.FieldLogger) grpc.UnaryServerInterceptor {
 	return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
-		observeMethodType(r, info.FullMethod)
+		observeMethodType(r, logger, info.FullMethod)
 
 		res, err := handler(ctx, req)
 
@@ -21,9 +21,9 @@ func MethodTypeUnaryInterceptor(r *protoregistry.Registry) grpc.UnaryServerInter
 }
 
 // MethodTypeStreamInterceptor returns a Stream Interceptor that records the method type of incoming RPC requests
-func MethodTypeStreamInterceptor(r *protoregistry.Registry) grpc.StreamServerInterceptor {
+func MethodTypeStreamInterceptor(r *protoregistry.Registry, logger logrus.FieldLogger) grpc.StreamServerInterceptor {
 	return func(srv interface{}, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
-		observeMethodType(r, info.FullMethod)
+		observeMethodType(r, logger, info.FullMethod)
 
 		err := handler(srv, stream)
 
@@ -31,14 +31,14 @@ func MethodTypeStreamInterceptor(r *protoregistry.Registry) grpc.StreamServerInt
 	}
 }
 
-func observeMethodType(registry *protoregistry.Registry, fullMethod string) {
+func observeMethodType(registry *protoregistry.Registry, logger logrus.FieldLogger, fullMethod string) {
 	if registry.IsInterceptedMethod(fullMethod) {
 		return
 	}
 
 	mi, err := registry.LookupMethod(fullMethod)
 	if err != nil {
-		logrus.WithField("full_method_name", fullMethod).WithError(err).Debug("error when looking up method info")
+		logger.WithField("full_method_name", fullMethod).WithError(err).Debug("error when looking up method info")
 	}
 
 	var opType string
diff --git a/internal/praefect/server.go b/internal/praefect/server.go
index 0b4a5e2f3..c425a0eb1 100644
--- a/internal/praefect/server.go
+++ b/internal/praefect/server.go
@@ -131,7 +131,7 @@ func NewGRPCServer(
 
 	unaryInterceptors := append(
 		commonUnaryServerInterceptors(deps.Logger, logMsgProducer),
-		middleware.MethodTypeUnaryInterceptor(deps.Registry),
+		middleware.MethodTypeUnaryInterceptor(deps.Registry, deps.Logger),
 		auth.UnaryServerInterceptor(deps.Config.Auth),
 	)
 	unaryInterceptors = append(unaryInterceptors, serverCfg.unaryInterceptors...)
@@ -139,7 +139,7 @@ func NewGRPCServer(
 	streamInterceptors := []grpc.StreamServerInterceptor{
 		grpcmwtags.StreamServerInterceptor(ctxtagsInterceptorOption()),
 		grpccorrelation.StreamServerCorrelationInterceptor(), // Must be above the metadata handler
-		middleware.MethodTypeStreamInterceptor(deps.Registry),
+		middleware.MethodTypeStreamInterceptor(deps.Registry, deps.Logger),
 		metadatahandler.StreamInterceptor,
 		grpcprometheus.StreamServerInterceptor,
 		grpcmwlogrus.StreamServerInterceptor(deps.Logger,