Skip to content

Commit 6e12447

Browse files
aknuds1alvinlin123
aknuds1
authored and
alvinlin123
committed
Chore: Use dskit/grpc* (cortexproject#4523)
Signed-off-by: Arve Knudsen <[email protected]> Signed-off-by: Alvin Lin <[email protected]>
1 parent 0bf901a commit 6e12447

File tree

756 files changed

+777
-124137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

756 files changed

+777
-124137
lines changed

‎docs/configuration/config-file-reference.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3809,6 +3809,16 @@ The `memberlist_config` configures the Gossip memberlist.
38093809
# CLI flag: -memberlist.compression-enabled
38103810
[compression_enabled: <boolean> | default = true]
38113811
3812+
# Gossip address to advertise to other members in the cluster. Used for NAT
3813+
# traversal.
3814+
# CLI flag: -memberlist.advertise-addr
3815+
[advertise_addr: <string> | default = ""]
3816+
3817+
# Gossip port to advertise to other members in the cluster. Used for NAT
3818+
# traversal.
3819+
# CLI flag: -memberlist.advertise-port
3820+
[advertise_port: <int> | default = 7946]
3821+
38123822
# Other cluster members to join. Can be specified multiple times. It can be an
38133823
# IP, hostname or an entry specified in the DNS Service Discovery format.
38143824
# CLI flag: -memberlist.join

‎go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ require (
2929
github.com/golang/protobuf v1.5.2
3030
github.com/golang/snappy v0.0.4
3131
github.com/gorilla/mux v1.8.0
32-
github.com/grafana/dskit v0.0.0-20210908150159-fcf48cb19aa4
33-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
32+
github.com/grafana/dskit v0.0.0-20211007183133-4c566019f311
3433
github.com/json-iterator/go v1.1.11
3534
github.com/lib/pq v1.3.0
3635
github.com/minio/minio-go/v7 v7.0.10
@@ -52,7 +51,7 @@ require (
5251
github.com/stretchr/testify v1.7.0
5352
github.com/thanos-io/thanos v0.22.0
5453
github.com/uber/jaeger-client-go v2.29.1+incompatible
55-
github.com/weaveworks/common v0.0.0-20210901124008-1fa3f9fa874c
54+
github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78
5655
go.etcd.io/bbolt v1.3.6
5756
go.uber.org/atomic v1.9.0
5857
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f

‎go.sum

Lines changed: 6 additions & 36 deletions
Large diffs are not rendered by default.

‎pkg/alertmanager/alertmanager_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"time"
66

77
"github.com/go-kit/log"
8+
"github.com/grafana/dskit/crypto/tls"
9+
"github.com/grafana/dskit/grpcclient"
810
"github.com/pkg/errors"
911
"github.com/prometheus/client_golang/prometheus"
1012
"github.com/prometheus/client_golang/prometheus/promauto"
@@ -13,8 +15,6 @@ import (
1315

1416
"github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb"
1517
"github.com/cortexproject/cortex/pkg/ring/client"
16-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
17-
"github.com/cortexproject/cortex/pkg/util/tls"
1818
)
1919

2020
// ClientsPool is the interface used to get the client from the pool for a specified address.

‎pkg/chunk/gcp/bigtable_index_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212

1313
"cloud.google.com/go/bigtable"
1414
"github.com/go-kit/log"
15+
"github.com/grafana/dskit/grpcclient"
1516
ot "github.com/opentracing/opentracing-go"
1617
"github.com/pkg/errors"
1718

1819
"github.com/cortexproject/cortex/pkg/chunk"
1920
chunk_util "github.com/cortexproject/cortex/pkg/chunk/util"
20-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
2121
"github.com/cortexproject/cortex/pkg/util/math"
2222
"github.com/cortexproject/cortex/pkg/util/spanlogger"
2323
)

‎pkg/configs/client/client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"time"
1313

1414
"github.com/go-kit/log/level"
15+
dstls "github.com/grafana/dskit/crypto/tls"
1516
"github.com/grafana/dskit/flagext"
1617
"github.com/prometheus/client_golang/prometheus"
1718
"github.com/prometheus/client_golang/prometheus/promauto"
@@ -20,7 +21,6 @@ import (
2021

2122
"github.com/cortexproject/cortex/pkg/configs/userconfig"
2223
util_log "github.com/cortexproject/cortex/pkg/util/log"
23-
tls_cfg "github.com/cortexproject/cortex/pkg/util/tls"
2424
)
2525

2626
var (
@@ -29,9 +29,9 @@ var (
2929

3030
// Config says where we can find the ruler userconfig.
3131
type Config struct {
32-
ConfigsAPIURL flagext.URLValue `yaml:"configs_api_url"`
33-
ClientTimeout time.Duration `yaml:"client_timeout"` // HTTP timeout duration for requests made to the Weave Cloud configs service.
34-
TLS tls_cfg.ClientConfig `yaml:",inline"`
32+
ConfigsAPIURL flagext.URLValue `yaml:"configs_api_url"`
33+
ClientTimeout time.Duration `yaml:"client_timeout"` // HTTP timeout duration for requests made to the Weave Cloud configs service.
34+
TLS dstls.ClientConfig `yaml:",inline"`
3535
}
3636

3737
// RegisterFlagsWithPrefix adds the flags required to config this to the given FlagSet

‎pkg/configs/db/dbtest/integration.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build integration
12
// +build integration
23

34
package dbtest

‎pkg/configs/db/dbtest/unit.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !integration
12
// +build !integration
23

34
package dbtest

‎pkg/configs/legacy_promql/fuzz.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// limitations under the License.
1313

1414
// Only build when go-fuzz is in use
15+
//go:build gofuzz
1516
// +build gofuzz
1617

1718
package promql

‎pkg/cortex/cortex.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/go-kit/log"
1414
"github.com/go-kit/log/level"
1515
"github.com/grafana/dskit/flagext"
16+
"github.com/grafana/dskit/grpcutil"
1617
"github.com/grafana/dskit/kv/memberlist"
1718
"github.com/grafana/dskit/modules"
1819
"github.com/grafana/dskit/runtimeconfig"
@@ -58,7 +59,6 @@ import (
5859
"github.com/cortexproject/cortex/pkg/tenant"
5960
"github.com/cortexproject/cortex/pkg/util"
6061
"github.com/cortexproject/cortex/pkg/util/fakeauth"
61-
"github.com/cortexproject/cortex/pkg/util/grpc/healthcheck"
6262
util_log "github.com/cortexproject/cortex/pkg/util/log"
6363
"github.com/cortexproject/cortex/pkg/util/process"
6464
"github.com/cortexproject/cortex/pkg/util/validation"
@@ -430,7 +430,7 @@ func (t *Cortex) Run() error {
430430
// before starting servers, register /ready handler and gRPC health check service.
431431
// It should reflect entire Cortex.
432432
t.Server.HTTP.Path("/ready").Handler(t.readyHandler(sm))
433-
grpc_health_v1.RegisterHealthServer(t.Server.GRPC, healthcheck.New(sm))
433+
grpc_health_v1.RegisterHealthServer(t.Server.GRPC, grpcutil.NewHealthCheck(sm))
434434

435435
// Let's listen for events from this manager, and log them.
436436
healthy := func() { level.Info(util_log.Logger).Log("msg", "Cortex started") }

‎pkg/distributor/query.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"sort"
77
"time"
88

9+
"github.com/grafana/dskit/grpcutil"
910
"github.com/opentracing/opentracing-go"
1011
"github.com/prometheus/common/model"
1112
"github.com/prometheus/prometheus/pkg/labels"
@@ -18,7 +19,6 @@ import (
1819
"github.com/cortexproject/cortex/pkg/tenant"
1920
"github.com/cortexproject/cortex/pkg/util"
2021
"github.com/cortexproject/cortex/pkg/util/extract"
21-
grpc_util "github.com/cortexproject/cortex/pkg/util/grpc"
2222
"github.com/cortexproject/cortex/pkg/util/limiter"
2323
"github.com/cortexproject/cortex/pkg/util/validation"
2424
)
@@ -308,7 +308,7 @@ func (d *Distributor) queryIngesterStream(ctx context.Context, replicationSet ri
308308
break
309309
} else if err != nil {
310310
// Do not track a failure if the context was canceled.
311-
if !grpc_util.IsGRPCContextCanceled(err) {
311+
if !grpcutil.IsGRPCContextCanceled(err) {
312312
d.ingesterQueryFailures.WithLabelValues(ing.Addr).Inc()
313313
}
314314

‎pkg/frontend/v1/frontend.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/cortexproject/cortex/pkg/scheduler/queue"
2222
"github.com/cortexproject/cortex/pkg/tenant"
2323
"github.com/cortexproject/cortex/pkg/util"
24-
"github.com/cortexproject/cortex/pkg/util/grpcutil"
24+
"github.com/cortexproject/cortex/pkg/util/httpgrpcutil"
2525
"github.com/cortexproject/cortex/pkg/util/validation"
2626
)
2727

@@ -154,7 +154,7 @@ func (f *Frontend) RoundTripGRPC(ctx context.Context, req *httpgrpc.HTTPRequest)
154154
// Propagate trace context in gRPC too - this will be ignored if using HTTP.
155155
tracer, span := opentracing.GlobalTracer(), opentracing.SpanFromContext(ctx)
156156
if tracer != nil && span != nil {
157-
carrier := (*grpcutil.HttpgrpcHeadersCarrier)(req)
157+
carrier := (*httpgrpcutil.HttpgrpcHeadersCarrier)(req)
158158
err := tracer.Inject(span.Context(), opentracing.HTTPHeaders, carrier)
159159
if err != nil {
160160
return nil, err

‎pkg/frontend/v2/frontend.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/go-kit/log"
1313
"github.com/go-kit/log/level"
1414
"github.com/grafana/dskit/flagext"
15+
"github.com/grafana/dskit/grpcclient"
1516
"github.com/grafana/dskit/services"
1617
"github.com/opentracing/opentracing-go"
1718
"github.com/pkg/errors"
@@ -23,8 +24,7 @@ import (
2324
"github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb"
2425
"github.com/cortexproject/cortex/pkg/querier/stats"
2526
"github.com/cortexproject/cortex/pkg/tenant"
26-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
27-
"github.com/cortexproject/cortex/pkg/util/grpcutil"
27+
"github.com/cortexproject/cortex/pkg/util/httpgrpcutil"
2828
)
2929

3030
// Config for a Frontend.
@@ -162,7 +162,7 @@ func (f *Frontend) RoundTripGRPC(ctx context.Context, req *httpgrpc.HTTPRequest)
162162
// Propagate trace context in gRPC too - this will be ignored if using HTTP.
163163
tracer, span := opentracing.GlobalTracer(), opentracing.SpanFromContext(ctx)
164164
if tracer != nil && span != nil {
165-
carrier := (*grpcutil.HttpgrpcHeadersCarrier)(req)
165+
carrier := (*httpgrpcutil.HttpgrpcHeadersCarrier)(req)
166166
if err := tracer.Inject(span.Context(), opentracing.HTTPHeaders, carrier); err != nil {
167167
return nil, err
168168
}

‎pkg/ingester/client/client.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ import (
44
"flag"
55

66
"github.com/go-kit/log"
7+
"github.com/grafana/dskit/grpcclient"
78
"github.com/prometheus/client_golang/prometheus"
89
"github.com/prometheus/client_golang/prometheus/promauto"
910
"google.golang.org/grpc"
1011
"google.golang.org/grpc/health/grpc_health_v1"
11-
12-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
1312
)
1413

1514
var ingesterClientRequestDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{

‎pkg/ingester/client/cortex_util_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import (
77
"testing"
88
"time"
99

10+
"github.com/grafana/dskit/grpcutil"
1011
"github.com/stretchr/testify/assert"
1112
"github.com/stretchr/testify/mock"
1213
"github.com/stretchr/testify/require"
1314
"google.golang.org/grpc"
1415
"google.golang.org/grpc/test/bufconn"
1516

16-
grpc_util "github.com/cortexproject/cortex/pkg/util/grpc"
1717
"github.com/cortexproject/cortex/pkg/util/test"
1818
)
1919

@@ -71,7 +71,7 @@ func TestSendQueryStream(t *testing.T) {
7171
// Try to receive the response and assert the error we get is the context.Canceled
7272
// wrapped within a gRPC error.
7373
_, err = stream.Recv()
74-
assert.Equal(t, true, grpc_util.IsGRPCContextCanceled(err))
74+
assert.Equal(t, true, grpcutil.IsGRPCContextCanceled(err))
7575

7676
// Wait until the assertions in the server mock have completed.
7777
wg.Wait()

‎pkg/querier/store_gateway_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"time"
66

77
"github.com/go-kit/log"
8+
"github.com/grafana/dskit/crypto/tls"
9+
"github.com/grafana/dskit/grpcclient"
810
"github.com/pkg/errors"
911
"github.com/prometheus/client_golang/prometheus"
1012
"github.com/prometheus/client_golang/prometheus/promauto"
@@ -13,8 +15,6 @@ import (
1315

1416
"github.com/cortexproject/cortex/pkg/ring/client"
1517
"github.com/cortexproject/cortex/pkg/storegateway/storegatewaypb"
16-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
17-
"github.com/cortexproject/cortex/pkg/util/tls"
1818
)
1919

2020
func newStoreGatewayClientFactory(clientCfg grpcclient.Config, reg prometheus.Registerer) client.PoolFactory {

‎pkg/querier/store_gateway_client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"testing"
77

88
"github.com/grafana/dskit/flagext"
9+
"github.com/grafana/dskit/grpcclient"
910
"github.com/prometheus/client_golang/prometheus"
1011
dto "github.com/prometheus/client_model/go"
1112
"github.com/stretchr/testify/assert"
@@ -15,7 +16,6 @@ import (
1516
"google.golang.org/grpc"
1617

1718
"github.com/cortexproject/cortex/pkg/storegateway/storegatewaypb"
18-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
1919
)
2020

2121
func Test_newStoreGatewayClientFactory(t *testing.T) {

‎pkg/querier/worker/scheduler_processor.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/go-kit/log"
1010
"github.com/go-kit/log/level"
1111
"github.com/grafana/dskit/backoff"
12+
"github.com/grafana/dskit/grpcclient"
1213
"github.com/grafana/dskit/services"
1314
otgrpc "github.com/opentracing-contrib/go-grpc"
1415
"github.com/opentracing/opentracing-go"
@@ -24,8 +25,7 @@ import (
2425
querier_stats "github.com/cortexproject/cortex/pkg/querier/stats"
2526
"github.com/cortexproject/cortex/pkg/ring/client"
2627
"github.com/cortexproject/cortex/pkg/scheduler/schedulerpb"
27-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
28-
"github.com/cortexproject/cortex/pkg/util/grpcutil"
28+
"github.com/cortexproject/cortex/pkg/util/httpgrpcutil"
2929
util_log "github.com/cortexproject/cortex/pkg/util/log"
3030
cortex_middleware "github.com/cortexproject/cortex/pkg/util/middleware"
3131
)
@@ -132,7 +132,7 @@ func (sp *schedulerProcessor) querierLoop(c schedulerpb.SchedulerForQuerier_Quer
132132

133133
tracer := opentracing.GlobalTracer()
134134
// Ignore errors here. If we cannot get parent span, we just don't create new one.
135-
parentSpanContext, _ := grpcutil.GetParentSpanForRequest(tracer, request.HttpRequest)
135+
parentSpanContext, _ := httpgrpcutil.GetParentSpanForRequest(tracer, request.HttpRequest)
136136
if parentSpanContext != nil {
137137
queueSpan, spanCtx := opentracing.StartSpanFromContextWithTracer(ctx, tracer, "querier_processor_runRequest", opentracing.ChildOf(parentSpanContext))
138138
defer queueSpan.Finish()

‎pkg/querier/worker/worker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import (
99

1010
"github.com/go-kit/log"
1111
"github.com/go-kit/log/level"
12+
"github.com/grafana/dskit/grpcclient"
1213
"github.com/grafana/dskit/services"
1314
"github.com/pkg/errors"
1415
"github.com/prometheus/client_golang/prometheus"
1516
"github.com/weaveworks/common/httpgrpc"
1617
"google.golang.org/grpc"
1718

1819
"github.com/cortexproject/cortex/pkg/util"
19-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
2020
)
2121

2222
type Config struct {

‎pkg/ruler/client_pool.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ package ruler
33
import (
44
"time"
55

6-
"github.com/grafana/dskit/services"
7-
86
"github.com/go-kit/log"
7+
"github.com/grafana/dskit/grpcclient"
8+
"github.com/grafana/dskit/services"
99
"github.com/pkg/errors"
1010
"github.com/prometheus/client_golang/prometheus"
1111
"github.com/prometheus/client_golang/prometheus/promauto"
1212
"google.golang.org/grpc"
1313
"google.golang.org/grpc/health/grpc_health_v1"
1414

1515
"github.com/cortexproject/cortex/pkg/ring/client"
16-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
1716
)
1817

1918
// ClientsPool is the interface used to get the client from the pool for a specified address.

‎pkg/ruler/client_pool_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ import (
66
"testing"
77

88
"github.com/grafana/dskit/flagext"
9+
"github.com/grafana/dskit/grpcclient"
910
"github.com/prometheus/client_golang/prometheus"
1011
dto "github.com/prometheus/client_model/go"
1112
"github.com/stretchr/testify/assert"
1213
"github.com/stretchr/testify/require"
1314
"github.com/weaveworks/common/user"
1415
"google.golang.org/grpc"
15-
16-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
1716
)
1817

1918
func Test_newRulerClientFactory(t *testing.T) {

‎pkg/ruler/notifier.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
gklog "github.com/go-kit/log"
1313
"github.com/go-kit/log/level"
14+
"github.com/grafana/dskit/crypto/tls"
1415
config_util "github.com/prometheus/common/config"
1516
"github.com/prometheus/common/model"
1617
"github.com/prometheus/prometheus/config"
@@ -19,7 +20,6 @@ import (
1920
"github.com/prometheus/prometheus/notifier"
2021

2122
"github.com/cortexproject/cortex/pkg/util"
22-
"github.com/cortexproject/cortex/pkg/util/tls"
2323
)
2424

2525
type NotifierConfig struct {

‎pkg/ruler/ruler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/go-kit/log"
1616
"github.com/go-kit/log/level"
1717
"github.com/grafana/dskit/flagext"
18+
"github.com/grafana/dskit/grpcclient"
1819
"github.com/grafana/dskit/kv"
1920
"github.com/grafana/dskit/services"
2021
"github.com/pkg/errors"
@@ -34,7 +35,6 @@ import (
3435
"github.com/cortexproject/cortex/pkg/tenant"
3536
"github.com/cortexproject/cortex/pkg/util"
3637
"github.com/cortexproject/cortex/pkg/util/concurrency"
37-
"github.com/cortexproject/cortex/pkg/util/grpcclient"
3838
util_log "github.com/cortexproject/cortex/pkg/util/log"
3939
"github.com/cortexproject/cortex/pkg/util/validation"
4040
)

0 commit comments

Comments
 (0)