revert: more inadvertent changes not part of this PR

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/gobuffalo/httptest v1.5.2
 	github.com/gobuffalo/pop/v6 v6.1.1
 	github.com/gofrs/uuid v4.4.0+incompatible
-	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/luna-duclos/instrumentedsql v1.1.3

internal/driver/daemon.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/ory/x/otelx/semconv"
 
-	grpcRecovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
+	grpcRecovery "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -32,7 +32,7 @@ import (
 
 	"github.com/ory/x/logrusx"
 
-	grpcLogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
+	grpcLogrus "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory/herodot"
 	"github.com/ory/x/reqlog"
@@ -457,7 +457,7 @@ func (r *RegistryDefault) unaryInterceptors(ctx context.Context) []grpc.UnarySer
 	is = append(is, r.defaultUnaryInterceptors...)
 	is = append(is,
 		herodot.UnaryErrorUnwrapInterceptor,
-		grpcLogrus.UnaryServerInterceptor(r.l.Entry),
+		grpcLogrus.UnaryServerInterceptor(InterceptorLogger(r.l.Logrus())),
 		r.pmm.UnaryServerInterceptor,
 	)
 	if r.sqaService != nil {
@@ -476,7 +476,7 @@ func (r *RegistryDefault) streamInterceptors(ctx context.Context) []grpc.StreamS
 	is = append(is, r.defaultStreamInterceptors...)
 	is = append(is,
 		herodot.StreamErrorUnwrapInterceptor,
-		grpcLogrus.StreamServerInterceptor(r.l.Entry),
+		grpcLogrus.StreamServerInterceptor(InterceptorLogger(r.l.Logrus())),
 		r.pmm.StreamServerInterceptor,
 	)
 	if r.sqaService != nil {