Skip to content

Commit a71ff2a

Browse files
aknuds1aknuds1
authored
Revert "Chore: Use dskit/grpc* (#4523)" (#4612)
This reverts commit 19f3802. Signed-off-by: Arve Knudsen <[email protected]>
1 parent 08279f0 commit a71ff2a

36 files changed

+1129
-36
lines changed

‎go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ require (
3030
github.com/golang/snappy v0.0.4
3131
github.com/gorilla/mux v1.8.0
3232
github.com/grafana/dskit v0.0.0-20220105080720-01ce9286d7d5
33+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
3334
github.com/json-iterator/go v1.1.12
3435
github.com/lib/pq v1.3.0
3536
github.com/minio/minio-go/v7 v7.0.10

‎pkg/alertmanager/alertmanager_client.go

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

77
"github.com/go-kit/log"
8-
"github.com/grafana/dskit/crypto/tls"
9-
"github.com/grafana/dskit/grpcclient"
108
"github.com/pkg/errors"
119
"github.com/prometheus/client_golang/prometheus"
1210
"github.com/prometheus/client_golang/prometheus/promauto"
@@ -15,6 +13,8 @@ import (
1513

1614
"github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb"
1715
"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"
1615
ot "github.com/opentracing/opentracing-go"
1716
"github.com/pkg/errors"
1817

1918
"github.com/cortexproject/cortex/pkg/chunk"
2019
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,7 +12,6 @@ import (
1212
"time"
1313

1414
"github.com/go-kit/log/level"
15-
dstls "github.com/grafana/dskit/crypto/tls"
1615
"github.com/grafana/dskit/flagext"
1716
"github.com/prometheus/client_golang/prometheus"
1817
"github.com/prometheus/client_golang/prometheus/promauto"
@@ -21,6 +20,7 @@ import (
2120

2221
"github.com/cortexproject/cortex/pkg/configs/userconfig"
2322
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 dstls.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 tls_cfg.ClientConfig `yaml:",inline"`
3535
}
3636

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

‎pkg/cortex/cortex.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ 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"
1716
"github.com/grafana/dskit/kv/memberlist"
1817
"github.com/grafana/dskit/modules"
1918
"github.com/grafana/dskit/services"
@@ -58,6 +57,7 @@ import (
5857
"github.com/cortexproject/cortex/pkg/tenant"
5958
"github.com/cortexproject/cortex/pkg/util"
6059
"github.com/cortexproject/cortex/pkg/util/fakeauth"
60+
"github.com/cortexproject/cortex/pkg/util/grpcutil"
6161
util_log "github.com/cortexproject/cortex/pkg/util/log"
6262
"github.com/cortexproject/cortex/pkg/util/process"
6363
"github.com/cortexproject/cortex/pkg/util/runtimeconfig"

‎pkg/distributor/query.go

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

9-
"github.com/grafana/dskit/grpcutil"
109
"github.com/opentracing/opentracing-go"
1110
"github.com/prometheus/common/model"
1211
"github.com/prometheus/prometheus/model/labels"
@@ -19,6 +18,7 @@ import (
1918
"github.com/cortexproject/cortex/pkg/tenant"
2019
"github.com/cortexproject/cortex/pkg/util"
2120
"github.com/cortexproject/cortex/pkg/util/extract"
21+
"github.com/cortexproject/cortex/pkg/util/grpcutil"
2222
"github.com/cortexproject/cortex/pkg/util/limiter"
2323
"github.com/cortexproject/cortex/pkg/util/validation"
2424
)

‎pkg/frontend/v2/frontend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ 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"
1615
"github.com/grafana/dskit/services"
1716
"github.com/opentracing/opentracing-go"
1817
"github.com/pkg/errors"
@@ -24,6 +23,7 @@ import (
2423
"github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb"
2524
"github.com/cortexproject/cortex/pkg/querier/stats"
2625
"github.com/cortexproject/cortex/pkg/tenant"
26+
"github.com/cortexproject/cortex/pkg/util/grpcclient"
2727
"github.com/cortexproject/cortex/pkg/util/httpgrpcutil"
2828
)
2929

‎pkg/ingester/client/client.go

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

66
"github.com/go-kit/log"
7-
"github.com/grafana/dskit/grpcclient"
87
"github.com/prometheus/client_golang/prometheus"
98
"github.com/prometheus/client_golang/prometheus/promauto"
109
"google.golang.org/grpc"
1110
"google.golang.org/grpc/health/grpc_health_v1"
11+
12+
"github.com/cortexproject/cortex/pkg/util/grpcclient"
1213
)
1314

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

‎pkg/ingester/client/cortex_util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/grafana/dskit/grpcutil"
1110
"github.com/stretchr/testify/assert"
1211
"github.com/stretchr/testify/mock"
1312
"github.com/stretchr/testify/require"
1413
"google.golang.org/grpc"
1514
"google.golang.org/grpc/test/bufconn"
1615

16+
"github.com/cortexproject/cortex/pkg/util/grpcutil"
1717
"github.com/cortexproject/cortex/pkg/util/test"
1818
)
1919

‎pkg/querier/store_gateway_client.go

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

77
"github.com/go-kit/log"
8-
"github.com/grafana/dskit/crypto/tls"
9-
"github.com/grafana/dskit/grpcclient"
108
"github.com/pkg/errors"
119
"github.com/prometheus/client_golang/prometheus"
1210
"github.com/prometheus/client_golang/prometheus/promauto"
@@ -15,6 +13,8 @@ import (
1513

1614
"github.com/cortexproject/cortex/pkg/ring/client"
1715
"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,7 +6,6 @@ import (
66
"testing"
77

88
"github.com/grafana/dskit/flagext"
9-
"github.com/grafana/dskit/grpcclient"
109
"github.com/prometheus/client_golang/prometheus"
1110
dto "github.com/prometheus/client_model/go"
1211
"github.com/stretchr/testify/assert"
@@ -16,6 +15,7 @@ import (
1615
"google.golang.org/grpc"
1716

1817
"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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ 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"
1312
dsmiddleware "github.com/grafana/dskit/middleware"
1413
"github.com/grafana/dskit/services"
1514
otgrpc "github.com/opentracing-contrib/go-grpc"
@@ -26,6 +25,7 @@ import (
2625
querier_stats "github.com/cortexproject/cortex/pkg/querier/stats"
2726
"github.com/cortexproject/cortex/pkg/ring/client"
2827
"github.com/cortexproject/cortex/pkg/scheduler/schedulerpb"
28+
"github.com/cortexproject/cortex/pkg/util/grpcclient"
2929
"github.com/cortexproject/cortex/pkg/util/httpgrpcutil"
3030
util_log "github.com/cortexproject/cortex/pkg/util/log"
3131
)

‎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"
1312
"github.com/grafana/dskit/services"
1413
"github.com/pkg/errors"
1514
"github.com/prometheus/client_golang/prometheus"
1615
"github.com/weaveworks/common/httpgrpc"
1716
"google.golang.org/grpc"
1817

1918
"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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"time"
55

66
"github.com/go-kit/log"
7-
"github.com/grafana/dskit/grpcclient"
87
"github.com/grafana/dskit/services"
98
"github.com/pkg/errors"
109
"github.com/prometheus/client_golang/prometheus"
@@ -13,6 +12,7 @@ import (
1312
"google.golang.org/grpc/health/grpc_health_v1"
1413

1514
"github.com/cortexproject/cortex/pkg/ring/client"
15+
"github.com/cortexproject/cortex/pkg/util/grpcclient"
1616
)
1717

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

‎pkg/ruler/client_pool_test.go

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

88
"github.com/grafana/dskit/flagext"
9-
"github.com/grafana/dskit/grpcclient"
109
"github.com/prometheus/client_golang/prometheus"
1110
dto "github.com/prometheus/client_model/go"
1211
"github.com/stretchr/testify/assert"
1312
"github.com/stretchr/testify/require"
1413
"github.com/weaveworks/common/user"
1514
"google.golang.org/grpc"
15+
16+
"github.com/cortexproject/cortex/pkg/util/grpcclient"
1617
)
1718

1819
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,7 +11,6 @@ import (
1111

1212
gklog "github.com/go-kit/log"
1313
"github.com/go-kit/log/level"
14-
"github.com/grafana/dskit/crypto/tls"
1514
config_util "github.com/prometheus/common/config"
1615
"github.com/prometheus/common/model"
1716
"github.com/prometheus/prometheus/config"
@@ -20,6 +19,7 @@ import (
2019
"github.com/prometheus/prometheus/notifier"
2120

2221
"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
@@ -16,7 +16,6 @@ import (
1616
"github.com/go-kit/log/level"
1717
"github.com/grafana/dskit/concurrency"
1818
"github.com/grafana/dskit/flagext"
19-
"github.com/grafana/dskit/grpcclient"
2019
"github.com/grafana/dskit/kv"
2120
"github.com/grafana/dskit/services"
2221
"github.com/pkg/errors"
@@ -35,6 +34,7 @@ import (
3534
"github.com/cortexproject/cortex/pkg/ruler/rulestore"
3635
"github.com/cortexproject/cortex/pkg/tenant"
3736
"github.com/cortexproject/cortex/pkg/util"
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
)

‎pkg/scheduler/scheduler.go

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

1111
"github.com/go-kit/log"
1212
"github.com/go-kit/log/level"
13-
"github.com/grafana/dskit/grpcclient"
1413
"github.com/grafana/dskit/services"
1514
otgrpc "github.com/opentracing-contrib/go-grpc"
1615
"github.com/opentracing/opentracing-go"
@@ -27,6 +26,7 @@ import (
2726
"github.com/cortexproject/cortex/pkg/scheduler/schedulerpb"
2827
"github.com/cortexproject/cortex/pkg/tenant"
2928
"github.com/cortexproject/cortex/pkg/util"
29+
"github.com/cortexproject/cortex/pkg/util/grpcclient"
3030
"github.com/cortexproject/cortex/pkg/util/httpgrpcutil"
3131
"github.com/cortexproject/cortex/pkg/util/validation"
3232
)

‎pkg/util/dns_watcher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"fmt"
66
"time"
77

8-
"github.com/grafana/dskit/grpcutil"
98
"github.com/grafana/dskit/services"
109
"github.com/pkg/errors"
1110

11+
"github.com/cortexproject/cortex/pkg/util/grpcutil"
1212
util_log "github.com/cortexproject/cortex/pkg/util/log"
1313
)
1414

‎vendor/github.com/grafana/dskit/grpcclient/backoff_retry.go renamed to ‎pkg/util/grpcclient/backoff_retry.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ package grpcclient
33
import (
44
"context"
55

6+
"github.com/grafana/dskit/backoff"
67
"google.golang.org/grpc"
78
"google.golang.org/grpc/codes"
89
"google.golang.org/grpc/status"
9-
10-
"github.com/grafana/dskit/backoff"
1110
)
1211

1312
// NewBackoffRetry gRPC middleware.

‎vendor/github.com/grafana/dskit/grpcclient/grpcclient.go renamed to ‎pkg/util/grpcclient/grpcclient.go

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

77
"github.com/go-kit/log"
8+
"github.com/grafana/dskit/backoff"
89
middleware "github.com/grpc-ecosystem/go-grpc-middleware"
910
"github.com/pkg/errors"
1011
"google.golang.org/grpc"
1112
"google.golang.org/grpc/encoding/gzip"
1213
"google.golang.org/grpc/keepalive"
1314

14-
"github.com/grafana/dskit/backoff"
15-
"github.com/grafana/dskit/crypto/tls"
16-
"github.com/grafana/dskit/grpcencoding/snappy"
15+
"github.com/cortexproject/cortex/pkg/util/grpcencoding/snappy"
16+
"github.com/cortexproject/cortex/pkg/util/tls"
1717
)
1818

1919
// Config for a gRPC client.

‎vendor/github.com/grafana/dskit/grpcclient/instrumentation.go renamed to ‎pkg/util/grpcclient/instrumentation.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package grpcclient
22

33
import (
4+
dsmiddleware "github.com/grafana/dskit/middleware"
45
otgrpc "github.com/opentracing-contrib/go-grpc"
56
"github.com/opentracing/opentracing-go"
67
"github.com/prometheus/client_golang/prometheus"
78
"github.com/weaveworks/common/middleware"
89
"google.golang.org/grpc"
9-
10-
dsmiddleware "github.com/grafana/dskit/middleware"
1110
)
1211

1312
func Instrument(requestDuration *prometheus.HistogramVec) ([]grpc.UnaryClientInterceptor, []grpc.StreamClientInterceptor) {

‎vendor/github.com/grafana/dskit/grpcclient/ratelimit.go renamed to ‎pkg/util/grpcclient/ratelimit.go

File renamed without changes.

‎pkg/util/grpcclient/ratelimit_test.go

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package grpcclient_test
2+
3+
import (
4+
"context"
5+
"testing"
6+
7+
"github.com/stretchr/testify/assert"
8+
"google.golang.org/grpc"
9+
"google.golang.org/grpc/codes"
10+
"google.golang.org/grpc/status"
11+
12+
"github.com/cortexproject/cortex/pkg/util/grpcclient"
13+
)
14+
15+
func TestRateLimiterFailureResultsInResourceExhaustedError(t *testing.T) {
16+
config := grpcclient.Config{
17+
RateLimitBurst: 0,
18+
RateLimit: 0,
19+
}
20+
conn := grpc.ClientConn{}
21+
invoker := func(currentCtx context.Context, currentMethod string, currentReq, currentRepl interface{}, currentConn *grpc.ClientConn, currentOpts ...grpc.CallOption) error {
22+
return nil
23+
}
24+
25+
limiter := grpcclient.NewRateLimiter(&config)
26+
err := limiter(context.Background(), "methodName", "", "expectedReply", &conn, invoker)
27+
28+
if se, ok := err.(interface {
29+
GRPCStatus() *status.Status
30+
}); ok {
31+
assert.Equal(t, se.GRPCStatus().Code(), codes.ResourceExhausted)
32+
assert.Equal(t, se.GRPCStatus().Message(), "rate: Wait(n=1) exceeds limiter's burst 0")
33+
} else {
34+
assert.Fail(t, "Could not convert error into expected Status type")
35+
}
36+
}

‎vendor/github.com/grafana/dskit/grpcencoding/snappy/snappy.go renamed to ‎pkg/util/grpcencoding/snappy/snappy.go

File renamed without changes.

0 commit comments

Comments
 (0)