Chore: Use dskit/limiter (#4327)

Signed-off-by: Arve Knudsen <[email protected]>
grafana · Sep 21, 2021 · 79b95d9 · 79b95d9
1 parent d5b6d05
commit 79b95d9
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -45,7 +45,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-20210914144857-dbbb3701e01d
 	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-20210914144857-dbbb3701e01d h1:pcAtisbhl+QI+DBLhLofmLK01PnMXhm7K+vi0cSoFjU=
+github.com/grafana/dskit v0.0.0-20210914144857-dbbb3701e01d/go.mod h1:m3eHzwe5IT5eE2MI3Ena2ooU8+Hek8IiVXb9yJ1+0rs=
 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/distributor/distributor.go b/pkg/distributor/distributor.go
@@ -10,8 +10,8 @@ import (
 	"github.com/cortexproject/cortex/pkg/ring"
 	ring_client "github.com/cortexproject/cortex/pkg/ring/client"
 	"github.com/cortexproject/cortex/pkg/tenant"
-	"github.com/cortexproject/cortex/pkg/util/limiter"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
+	"github.com/grafana/dskit/limiter"
 	"github.com/grafana/dskit/services"
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/opentracing/opentracing-go"

diff --git a/pkg/distributor/ingestion_rate_strategy.go b/pkg/distributor/ingestion_rate_strategy.go
@@ -1,7 +1,7 @@
 package distributor
 
 import (
-	"github.com/cortexproject/cortex/pkg/util/limiter"
+	"github.com/grafana/dskit/limiter"
 
 	"github.com/grafana/loki/pkg/validation"
 )

diff --git a/pkg/distributor/ingestion_rate_strategy_test.go b/pkg/distributor/ingestion_rate_strategy_test.go
@@ -3,7 +3,7 @@ package distributor
 import (
 	"testing"
 
-	"github.com/cortexproject/cortex/pkg/util/limiter"
+	"github.com/grafana/dskit/limiter"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

diff --git a/vendor/github.com/grafana/dskit/kv/memberlist/memberlist_client.go b/vendor/github.com/grafana/dskit/kv/memberlist/memberlist_client.go
diff --git a/vendor/github.com/grafana/dskit/limiter/rate_limiter.go b/vendor/github.com/grafana/dskit/limiter/rate_limiter.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -561,7 +561,7 @@ github.com/gorilla/mux
 # github.com/gorilla/websocket v1.4.2
 ## explicit
 github.com/gorilla/websocket
-# github.com/grafana/dskit v0.0.0-20210910100700-60e6d9b19675
+# github.com/grafana/dskit v0.0.0-20210914144857-dbbb3701e01d
 ## explicit
 github.com/grafana/dskit/backoff
 github.com/grafana/dskit/closer
@@ -572,6 +572,7 @@ github.com/grafana/dskit/kv/consul
 github.com/grafana/dskit/kv/etcd
 github.com/grafana/dskit/kv/kvtls
 github.com/grafana/dskit/kv/memberlist
+github.com/grafana/dskit/limiter
 github.com/grafana/dskit/middleware
 github.com/grafana/dskit/modules
 github.com/grafana/dskit/runtimeconfig