Reintroduce pkg/util/middleware, in place of dskit/middleware

Signed-off-by: Arve Knudsen <[email protected]>

Author: aknuds1

pkg/chunk/gcp/instrumentation.go

@@ -6,14 +6,15 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/grafana/dskit/middleware"
 	otgrpc "github.com/opentracing-contrib/go-grpc"
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"google.golang.org/api/option"
 	google_http "google.golang.org/api/transport/http"
 	"google.golang.org/grpc"
+
+	"github.com/cortexproject/cortex/pkg/util/middleware"
 )
 
 var (

pkg/querier/worker/scheduler_processor.go

@@ -9,7 +9,6 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/backoff"
-	dsmiddleware "github.com/grafana/dskit/middleware"
 	"github.com/grafana/dskit/services"
 	otgrpc "github.com/opentracing-contrib/go-grpc"
 	"github.com/opentracing/opentracing-go"
@@ -28,6 +27,7 @@ import (
 	"github.com/cortexproject/cortex/pkg/util/grpcclient"
 	"github.com/cortexproject/cortex/pkg/util/httpgrpcutil"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
+	cortexmiddleware "github.com/cortexproject/cortex/pkg/util/middleware"
 )
 
 func newSchedulerProcessor(cfg Config, handler RequestHandler, log log.Logger, reg prometheus.Registerer) (*schedulerProcessor, []services.Service) {
@@ -198,7 +198,7 @@ func (sp *schedulerProcessor) createFrontendClient(addr string) (client.PoolClie
 	opts, err := sp.grpcConfig.DialOption([]grpc.UnaryClientInterceptor{
 		otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer()),
 		middleware.ClientUserHeaderInterceptor,
-		dsmiddleware.PrometheusGRPCUnaryInstrumentation(sp.frontendClientRequestDuration),
+		cortexmiddleware.PrometheusGRPCUnaryInstrumentation(sp.frontendClientRequestDuration),
 	}, nil)
 
 	if err != nil {

pkg/util/grpcclient/instrumentation.go

@@ -1,22 +1,23 @@
 package grpcclient
 
 import (
-	dsmiddleware "github.com/grafana/dskit/middleware"
 	otgrpc "github.com/opentracing-contrib/go-grpc"
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/weaveworks/common/middleware"
 	"google.golang.org/grpc"
+
+	cortexmiddleware "github.com/cortexproject/cortex/pkg/util/middleware"
 )
 
 func Instrument(requestDuration *prometheus.HistogramVec) ([]grpc.UnaryClientInterceptor, []grpc.StreamClientInterceptor) {
 	return []grpc.UnaryClientInterceptor{
 			otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer()),
 			middleware.ClientUserHeaderInterceptor,
-			dsmiddleware.PrometheusGRPCUnaryInstrumentation(requestDuration),
+			cortexmiddleware.PrometheusGRPCUnaryInstrumentation(requestDuration),
 		}, []grpc.StreamClientInterceptor{
 			otgrpc.OpenTracingStreamClientInterceptor(opentracing.GlobalTracer()),
 			middleware.StreamClientUserHeaderInterceptor,
-			dsmiddleware.PrometheusGRPCStreamInstrumentation(requestDuration),
+			cortexmiddleware.PrometheusGRPCStreamInstrumentation(requestDuration),
 		}
 }

vendor/github.com/grafana/dskit/middleware/grpc.go renamed to pkg/util/middleware/grpc.go

@@ -0,0 +1,40 @@
+package middleware
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/weaveworks/common/httpgrpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+func TestErrorCode_NoError(t *testing.T) {
+	a := errorCode(nil)
+	assert.Equal(t, a, "2xx")
+}
+
+func TestErrorCode_Any5xx(t *testing.T) {
+	err := httpgrpc.Errorf(http.StatusNotImplemented, "Fail")
+	a := errorCode(err)
+	assert.Equal(t, a, "5xx")
+}
+
+func TestErrorCode_Any4xx(t *testing.T) {
+	err := httpgrpc.Errorf(http.StatusConflict, "Fail")
+	a := errorCode(err)
+	assert.Equal(t, a, "4xx")
+}
+
+func TestErrorCode_Canceled(t *testing.T) {
+	err := status.Errorf(codes.Canceled, "Fail")
+	a := errorCode(err)
+	assert.Equal(t, a, "cancel")
+}
+
+func TestErrorCode_Unknown(t *testing.T) {
+	err := status.Errorf(codes.Unknown, "Fail")
+	a := errorCode(err)
+	assert.Equal(t, a, "error")
+}