middleware: Move package into `internal/grpc/`

We've grown quite a bunch of packages that provide various different
functionality in the context of gRPC. But it is not easy to identify
them as there is no common hierarchy for gRPC-related functionality.
We're thus introducing a new `internal/grpc` package that will host
various bits and pieces related to gRPC.

Move the `internal/middleware` package into this new package.

48 files changed, 31 insertions, 31 deletions

diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go
index 782f81128..2e15e6a65 100644
--- a/cmd/gitaly-hooks/hooks_test.go
+++ b/cmd/gitaly-hooks/hooks_test.go
@@ -26,11 +26,11 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitlab"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper/text"
 	gitalylog "gitlab.com/gitlab-org/gitaly/v16/internal/log"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/metadata"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/metadata/featureflag"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg"
diff --git a/internal/cli/gitaly/serve.go b/internal/cli/gitaly/serve.go
index 4f310cc7b..e2c6c48ca 100644
--- a/internal/cli/gitaly/serve.go
+++ b/internal/cli/gitaly/serve.go
@@ -37,10 +37,10 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitlab"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper/env"
 	glog "gitlab.com/gitlab-org/gitaly/v16/internal/log"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/streamcache"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/tempdir"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/tracing"
diff --git a/internal/cli/praefect/subcmd_track_repository.go b/internal/cli/praefect/subcmd_track_repository.go
index ab71b1c6d..1c28cbe28 100644
--- a/internal/cli/praefect/subcmd_track_repository.go
+++ b/internal/cli/praefect/subcmd_track_repository.go
@@ -12,8 +12,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	glcli "gitlab.com/gitlab-org/gitaly/v16/internal/cli"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/log"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/commonerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config"
diff --git a/internal/gitaly/config/sentry/sentry.go b/internal/gitaly/config/sentry/sentry.go
index e0acc7f9e..a63207201 100644
--- a/internal/gitaly/config/sentry/sentry.go
+++ b/internal/gitaly/config/sentry/sentry.go
@@ -5,7 +5,7 @@ import (
 
 	sentry "github.com/getsentry/sentry-go"
 	log "github.com/sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/panichandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler"
 )
 
 // Config contains configuration for sentry
diff --git a/internal/gitaly/server/auth_test.go b/internal/gitaly/server/auth_test.go
index fc9a24149..1644affbb 100644
--- a/internal/gitaly/server/auth_test.go
+++ b/internal/gitaly/server/auth_test.go
@@ -28,7 +28,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitlab"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
diff --git a/internal/gitaly/server/server.go b/internal/gitaly/server/server.go
index f793d853a..d9ffa9ae8 100644
--- a/internal/gitaly/server/server.go
+++ b/internal/gitaly/server/server.go
@@ -12,18 +12,18 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/cache"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/commandstatshandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/featureflag"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/metadatahandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/statushandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpcstats"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper/fieldextractors"
 	gitalylog "gitlab.com/gitlab-org/gitaly/v16/internal/log"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/logsanitizer"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/cache"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/commandstatshandler"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/featureflag"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/metadatahandler"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/panichandler"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/sentryhandler"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/statushandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/protoregistry"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
 	grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc"
diff --git a/internal/gitaly/server/server_factory.go b/internal/gitaly/server/server_factory.go
index 19beea931..10afb3ce3 100644
--- a/internal/gitaly/server/server_factory.go
+++ b/internal/gitaly/server/server_factory.go
@@ -7,7 +7,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/cache"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"google.golang.org/grpc"
 )
 
diff --git a/internal/gitaly/service/dependencies.go b/internal/gitaly/service/dependencies.go
index 01bb080c5..3eb528e75 100644
--- a/internal/gitaly/service/dependencies.go
+++ b/internal/gitaly/service/dependencies.go
@@ -14,7 +14,7 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitlab"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/streamcache"
 )
 
diff --git a/internal/gitaly/service/hook/pack_objects_test.go b/internal/gitaly/service/hook/pack_objects_test.go
index 4c2de55ab..b02775583 100644
--- a/internal/gitaly/service/hook/pack_objects_test.go
+++ b/internal/gitaly/service/hook/pack_objects_test.go
@@ -23,9 +23,9 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
 	hookPkg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/metadata/featureflag"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/streamcache"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg"
diff --git a/internal/gitaly/service/hook/server.go b/internal/gitaly/service/hook/server.go
index b1c1ed283..55de7f68e 100644
--- a/internal/gitaly/service/hook/server.go
+++ b/internal/gitaly/service/hook/server.go
@@ -6,7 +6,7 @@ import (
 
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/streamcache"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
 )
diff --git a/internal/middleware/cache/cache.go b/internal/grpc/middleware/cache/cache.go
index cb5fbb219..cb5fbb219 100644
--- a/internal/middleware/cache/cache.go
+++ b/internal/grpc/middleware/cache/cache.go
diff --git a/internal/middleware/cache/cache_test.go b/internal/grpc/middleware/cache/cache_test.go
index 588063474..588063474 100644
--- a/internal/middleware/cache/cache_test.go
+++ b/internal/grpc/middleware/cache/cache_test.go
diff --git a/internal/middleware/cache/export_test.go b/internal/grpc/middleware/cache/export_test.go
index 48c1dab84..48c1dab84 100644
--- a/internal/middleware/cache/export_test.go
+++ b/internal/grpc/middleware/cache/export_test.go
diff --git a/internal/middleware/cache/prometheus.go b/internal/grpc/middleware/cache/prometheus.go
index 2d1790e3f..2d1790e3f 100644
--- a/internal/middleware/cache/prometheus.go
+++ b/internal/grpc/middleware/cache/prometheus.go
diff --git a/internal/middleware/commandstatshandler/commandstatshandler.go b/internal/grpc/middleware/commandstatshandler/commandstatshandler.go
index c1029e1d8..c1029e1d8 100644
--- a/internal/middleware/commandstatshandler/commandstatshandler.go
+++ b/internal/grpc/middleware/commandstatshandler/commandstatshandler.go
diff --git a/internal/middleware/commandstatshandler/commandstatshandler_test.go b/internal/grpc/middleware/commandstatshandler/commandstatshandler_test.go
index 483a2cc3d..483a2cc3d 100644
--- a/internal/middleware/commandstatshandler/commandstatshandler_test.go
+++ b/internal/grpc/middleware/commandstatshandler/commandstatshandler_test.go
diff --git a/internal/middleware/featureflag/featureflag_handler.go b/internal/grpc/middleware/featureflag/featureflag_handler.go
index 0bd40a3e6..0bd40a3e6 100644
--- a/internal/middleware/featureflag/featureflag_handler.go
+++ b/internal/grpc/middleware/featureflag/featureflag_handler.go
diff --git a/internal/middleware/featureflag/featureflag_handler_test.go b/internal/grpc/middleware/featureflag/featureflag_handler_test.go
index b4834d0c6..b4834d0c6 100644
--- a/internal/middleware/featureflag/featureflag_handler_test.go
+++ b/internal/grpc/middleware/featureflag/featureflag_handler_test.go
diff --git a/internal/middleware/limithandler/concurrency_limiter.go b/internal/grpc/middleware/limithandler/concurrency_limiter.go
index 1f807d9db..1f807d9db 100644
--- a/internal/middleware/limithandler/concurrency_limiter.go
+++ b/internal/grpc/middleware/limithandler/concurrency_limiter.go
diff --git a/internal/middleware/limithandler/concurrency_limiter_test.go b/internal/grpc/middleware/limithandler/concurrency_limiter_test.go
index 0a0fa0734..0a0fa0734 100644
--- a/internal/middleware/limithandler/concurrency_limiter_test.go
+++ b/internal/grpc/middleware/limithandler/concurrency_limiter_test.go
diff --git a/internal/middleware/limithandler/middleware.go b/internal/grpc/middleware/limithandler/middleware.go
index c532943a4..c532943a4 100644
--- a/internal/middleware/limithandler/middleware.go
+++ b/internal/grpc/middleware/limithandler/middleware.go
diff --git a/internal/middleware/limithandler/middleware_test.go b/internal/grpc/middleware/limithandler/middleware_test.go
index e3a260f32..bd5f28240 100644
--- a/internal/middleware/limithandler/middleware_test.go
+++ b/internal/grpc/middleware/limithandler/middleware_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
diff --git a/internal/middleware/limithandler/monitor.go b/internal/grpc/middleware/limithandler/monitor.go
index da295c563..da295c563 100644
--- a/internal/middleware/limithandler/monitor.go
+++ b/internal/grpc/middleware/limithandler/monitor.go
diff --git a/internal/middleware/limithandler/monitor_test.go b/internal/grpc/middleware/limithandler/monitor_test.go
index 1c5eb9dbf..1c5eb9dbf 100644
--- a/internal/middleware/limithandler/monitor_test.go
+++ b/internal/grpc/middleware/limithandler/monitor_test.go
diff --git a/internal/middleware/limithandler/rate_limiter.go b/internal/grpc/middleware/limithandler/rate_limiter.go
index be09a1f77..be09a1f77 100644
--- a/internal/middleware/limithandler/rate_limiter.go
+++ b/internal/grpc/middleware/limithandler/rate_limiter.go
diff --git a/internal/middleware/limithandler/rate_limiter_test.go b/internal/grpc/middleware/limithandler/rate_limiter_test.go
index 5e88b8f6b..5e88b8f6b 100644
--- a/internal/middleware/limithandler/rate_limiter_test.go
+++ b/internal/grpc/middleware/limithandler/rate_limiter_test.go
diff --git a/internal/middleware/limithandler/stats.go b/internal/grpc/middleware/limithandler/stats.go
index 30926695a..30926695a 100644
--- a/internal/middleware/limithandler/stats.go
+++ b/internal/grpc/middleware/limithandler/stats.go
diff --git a/internal/middleware/limithandler/stats_interceptor_test.go b/internal/grpc/middleware/limithandler/stats_interceptor_test.go
index adbc35fa5..010e487c8 100644
--- a/internal/middleware/limithandler/stats_interceptor_test.go
+++ b/internal/grpc/middleware/limithandler/stats_interceptor_test.go
@@ -16,8 +16,8 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/log"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg"
 	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
diff --git a/internal/middleware/limithandler/stats_test.go b/internal/grpc/middleware/limithandler/stats_test.go
index 53ccccfd5..53ccccfd5 100644
--- a/internal/middleware/limithandler/stats_test.go
+++ b/internal/grpc/middleware/limithandler/stats_test.go
diff --git a/internal/middleware/limithandler/testhelper_test.go b/internal/grpc/middleware/limithandler/testhelper_test.go
index 137c47cce..137c47cce 100644
--- a/internal/middleware/limithandler/testhelper_test.go
+++ b/internal/grpc/middleware/limithandler/testhelper_test.go
diff --git a/internal/middleware/metadatahandler/metadatahandler.go b/internal/grpc/middleware/metadatahandler/metadatahandler.go
index bae12151e..bae12151e 100644
--- a/internal/middleware/metadatahandler/metadatahandler.go
+++ b/internal/grpc/middleware/metadatahandler/metadatahandler.go
diff --git a/internal/middleware/metadatahandler/metadatahandler_test.go b/internal/grpc/middleware/metadatahandler/metadatahandler_test.go
index 7f665574f..7f665574f 100644
--- a/internal/middleware/metadatahandler/metadatahandler_test.go
+++ b/internal/grpc/middleware/metadatahandler/metadatahandler_test.go
diff --git a/internal/middleware/panichandler/LICENSE b/internal/grpc/middleware/panichandler/LICENSE
index b1bb8825b..b1bb8825b 100644
--- a/internal/middleware/panichandler/LICENSE
+++ b/internal/grpc/middleware/panichandler/LICENSE
diff --git a/internal/middleware/panichandler/README.md b/internal/grpc/middleware/panichandler/README.md
index 03b32ec15..03b32ec15 100644
--- a/internal/middleware/panichandler/README.md
+++ b/internal/grpc/middleware/panichandler/README.md
diff --git a/internal/middleware/panichandler/panic_handler.go b/internal/grpc/middleware/panichandler/panic_handler.go
index e91269d5f..e91269d5f 100644
--- a/internal/middleware/panichandler/panic_handler.go
+++ b/internal/grpc/middleware/panichandler/panic_handler.go
diff --git a/internal/middleware/sentryhandler/sentryhandler.go b/internal/grpc/middleware/sentryhandler/sentryhandler.go
index a6645c552..a6645c552 100644
--- a/internal/middleware/sentryhandler/sentryhandler.go
+++ b/internal/grpc/middleware/sentryhandler/sentryhandler.go
diff --git a/internal/middleware/sentryhandler/sentryhandler_test.go b/internal/grpc/middleware/sentryhandler/sentryhandler_test.go
index 7a98e22ea..7a98e22ea 100644
--- a/internal/middleware/sentryhandler/sentryhandler_test.go
+++ b/internal/grpc/middleware/sentryhandler/sentryhandler_test.go
diff --git a/internal/middleware/statushandler/statushandler.go b/internal/grpc/middleware/statushandler/statushandler.go
index 07b736d97..07b736d97 100644
--- a/internal/middleware/statushandler/statushandler.go
+++ b/internal/grpc/middleware/statushandler/statushandler.go
diff --git a/internal/middleware/statushandler/statushandler_test.go b/internal/grpc/middleware/statushandler/statushandler_test.go
index 077806ba5..077806ba5 100644
--- a/internal/middleware/statushandler/statushandler_test.go
+++ b/internal/grpc/middleware/statushandler/statushandler_test.go
diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go
index 2431fa058..c97de1853 100644
--- a/internal/praefect/coordinator.go
+++ b/internal/praefect/coordinator.go
@@ -11,10 +11,10 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 	gitalyerrors "gitlab.com/gitlab-org/gitaly/v16/internal/errors"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/metadata"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/metadata/featureflag"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/commonerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore"
diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go
index 946ed5161..841101850 100644
--- a/internal/praefect/coordinator_test.go
+++ b/internal/praefect/coordinator_test.go
@@ -26,9 +26,9 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
 	gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/metadatahandler"
 	gitaly_metadata "gitlab.com/gitlab-org/gitaly/v16/internal/metadata"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/metadata/featureflag"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/commonerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore"
diff --git a/internal/praefect/grpc-proxy/proxy/handler.go b/internal/praefect/grpc-proxy/proxy/handler.go
index 25dbed58e..eccaf00f5 100644
--- a/internal/praefect/grpc-proxy/proxy/handler.go
+++ b/internal/praefect/grpc-proxy/proxy/handler.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"io"
 
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/sentryhandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/internal/praefect/grpc-proxy/proxy/testhelper_test.go b/internal/praefect/grpc-proxy/proxy/testhelper_test.go
index 929e8e4f3..d5b608bb4 100644
--- a/internal/praefect/grpc-proxy/proxy/testhelper_test.go
+++ b/internal/praefect/grpc-proxy/proxy/testhelper_test.go
@@ -7,8 +7,8 @@ import (
 
 	grpcmwtags "github.com/grpc-ecosystem/go-grpc-middleware/tags"
 	"github.com/stretchr/testify/require"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper/fieldextractors"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/sentryhandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/grpc-proxy/proxy"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
 	"google.golang.org/grpc"
diff --git a/internal/praefect/reconciler/reconciler_test.go b/internal/praefect/reconciler/reconciler_test.go
index 66ae97307..bf68e4898 100644
--- a/internal/praefect/reconciler/reconciler_test.go
+++ b/internal/praefect/reconciler/reconciler_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/commonerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore"
diff --git a/internal/praefect/replicator.go b/internal/praefect/replicator.go
index bbbf69269..841871741 100644
--- a/internal/praefect/replicator.go
+++ b/internal/praefect/replicator.go
@@ -11,8 +11,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore"
 	prommetrics "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics"
diff --git a/internal/praefect/replicator_test.go b/internal/praefect/replicator_test.go
index 288937e0a..3114e3d05 100644
--- a/internal/praefect/replicator_test.go
+++ b/internal/praefect/replicator_test.go
@@ -20,8 +20,8 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/metadatahandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes"
diff --git a/internal/praefect/server.go b/internal/praefect/server.go
index 7665a243a..85848d8ff 100644
--- a/internal/praefect/server.go
+++ b/internal/praefect/server.go
@@ -14,13 +14,13 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/metadatahandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/statushandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper/fieldextractors"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/log"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/metadatahandler"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/panichandler"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/sentryhandler"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/statushandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/praefect/grpc-proxy/proxy"
diff --git a/internal/testhelper/testserver/gitaly.go b/internal/testhelper/testserver/gitaly.go
index 2bb8b1352..0f7349d7c 100644
--- a/internal/testhelper/testserver/gitaly.go
+++ b/internal/testhelper/testserver/gitaly.go
@@ -29,8 +29,8 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitlab"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/middleware/limithandler"
 	praefectconfig "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/streamcache"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"