Chore: Use dskit/grpcclient

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
grafana · Sep 10, 2021 · e080605 · e080605
1 parent 4e256cf
commit e080605
Show file tree

Hide file tree

Showing 18 changed files with 429 additions and 22 deletions.
diff --git a/go.mod b/go.mod
@@ -44,7 +44,7 @@ require (
 	github.com/google/go-cmp v0.5.6
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
-	github.com/grafana/dskit v0.0.0-20210910100700-60e6d9b19675
+	github.com/grafana/dskit v0.0.0-20210910120820-a8c4a2c78843
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645

diff --git a/go.sum b/go.sum
@@ -1077,8 +1077,8 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
 github.com/grafana/dskit v0.0.0-20210908150159-fcf48cb19aa4/go.mod h1:m3eHzwe5IT5eE2MI3Ena2ooU8+Hek8IiVXb9yJ1+0rs=
-github.com/grafana/dskit v0.0.0-20210910100700-60e6d9b19675 h1:50UgpAdLj3aP9PWi3U1fDzYWhw+kLfaJN1RHG8/ThpY=
-github.com/grafana/dskit v0.0.0-20210910100700-60e6d9b19675/go.mod h1:m3eHzwe5IT5eE2MI3Ena2ooU8+Hek8IiVXb9yJ1+0rs=
+github.com/grafana/dskit v0.0.0-20210910120820-a8c4a2c78843 h1:23AnCGdcZOYklzyXA+GYGvo5uXoS9sozO/FGqbkvREo=
+github.com/grafana/dskit v0.0.0-20210910120820-a8c4a2c78843/go.mod h1:Uxg4HyImgiV5PMX6eSQJfuPv+64CIasBrlZ7KtVBBWs=
 github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 h1:xLuzPoOzdfNb/RF/IENCw+oLVdZB4G21VPhkHBgwSHY=
 github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85/go.mod h1:crI9WX6p0IhrqB+DqIUHulRW853PaNFf7o4UprV//3I=
 github.com/grafana/tail v0.0.0-20201004203643-7aa4e4a91f03 h1:fGgFrAraMB0BaPfYumu+iulfDXwHm+GFyHA4xEtBqI8=

diff --git a/pkg/ingester/client/client.go b/pkg/ingester/client/client.go
@@ -6,7 +6,8 @@ import (
 	"time"
 
 	"github.com/cortexproject/cortex/pkg/distributor"
-	"github.com/cortexproject/cortex/pkg/util/grpcclient"
+	cortex_middleware "github.com/cortexproject/cortex/pkg/util/middleware"
+	"github.com/grafana/dskit/grpcclient"
 	"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
@@ -15,8 +16,6 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
-	cortex_middleware "github.com/cortexproject/cortex/pkg/util/middleware"
-
 	"github.com/grafana/loki/pkg/logproto"
 )
 

diff --git a/pkg/loki/loki.go b/pkg/loki/loki.go
@@ -15,11 +15,11 @@ import (
 	"github.com/cortexproject/cortex/pkg/scheduler"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/fakeauth"
-	"github.com/cortexproject/cortex/pkg/util/grpc/healthcheck"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/felixge/fgprof"
 	"github.com/go-kit/kit/log/level"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/grpcutil/healthcheck"
 	"github.com/grafana/dskit/kv/memberlist"
 	"github.com/grafana/dskit/modules"
 	"github.com/grafana/dskit/runtimeconfig"

diff --git a/pkg/querier/querier_mock_test.go b/pkg/querier/querier_mock_test.go
@@ -9,8 +9,7 @@ import (
 	"github.com/cortexproject/cortex/pkg/distributor"
 	"github.com/cortexproject/cortex/pkg/ring"
 	ring_client "github.com/cortexproject/cortex/pkg/ring/client"
-	"github.com/cortexproject/cortex/pkg/util/grpcclient"
-
+	"github.com/grafana/dskit/grpcclient"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/pkg/labels"

diff --git a/pkg/storage/chunk/gcp/bigtable_index_client.go b/pkg/storage/chunk/gcp/bigtable_index_client.go
@@ -11,14 +11,13 @@ import (
 	"time"
 
 	"cloud.google.com/go/bigtable"
+	"github.com/cortexproject/cortex/pkg/util/math"
+	"github.com/cortexproject/cortex/pkg/util/spanlogger"
 	"github.com/go-kit/kit/log"
+	"github.com/grafana/dskit/grpcclient"
 	ot "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 
-	"github.com/cortexproject/cortex/pkg/util/grpcclient"
-	"github.com/cortexproject/cortex/pkg/util/math"
-	"github.com/cortexproject/cortex/pkg/util/spanlogger"
-
 	"github.com/grafana/loki/pkg/storage/chunk"
 	chunk_util "github.com/grafana/loki/pkg/storage/chunk/util"
 )

diff --git a/pkg/storage/stores/shipper/gateway_client.go b/pkg/storage/stores/shipper/gateway_client.go
@@ -6,11 +6,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/cortexproject/cortex/pkg/util/grpcclient"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 	util_math "github.com/cortexproject/cortex/pkg/util/math"
-
 	"github.com/go-kit/kit/log/level"
+	"github.com/grafana/dskit/grpcclient"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"

diff --git a/.../github.com/grafana/dskit/kv/kvtls/tls.go → ...ithub.com/grafana/dskit/crypto/tls/tls.go b/.../github.com/grafana/dskit/kv/kvtls/tls.go → ...ithub.com/grafana/dskit/crypto/tls/tls.go
diff --git a/vendor/github.com/grafana/dskit/grpcclient/backoff_retry.go b/vendor/github.com/grafana/dskit/grpcclient/backoff_retry.go
diff --git a/vendor/github.com/grafana/dskit/grpcclient/grpcclient.go b/vendor/github.com/grafana/dskit/grpcclient/grpcclient.go
diff --git a/vendor/github.com/grafana/dskit/grpcclient/instrumentation.go b/vendor/github.com/grafana/dskit/grpcclient/instrumentation.go
diff --git a/vendor/github.com/grafana/dskit/grpcclient/ratelimit.go b/vendor/github.com/grafana/dskit/grpcclient/ratelimit.go
diff --git a/vendor/github.com/grafana/dskit/grpcencoding/snappy/snappy.go b/vendor/github.com/grafana/dskit/grpcencoding/snappy/snappy.go