Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migration to dskit/ring #336

Merged
merged 18 commits into from
Oct 18, 2021
Merged

Migration to dskit/ring #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fbdfaf9
WIP migration to dskit/ring
Oct 11, 2021
9bc56dc
Merge remote-tracking branch 'origin/main' into dskit-ring
aknuds1 Oct 12, 2021
63381af
Fix *_ring go file loggers. Update to dskit with new ring changes
Oct 12, 2021
6e368b6
Refactor tests to use ignore log lines, re-add pedantic registry
Oct 12, 2021
e9b2298
Cleanup imports for dskit ring
Oct 12, 2021
ec872bc
client straggler cleanup
Oct 12, 2021
24929fa
Update dskit
Oct 13, 2021
b598fde
Remove log message from numTokens
Oct 13, 2021
64aabda
Clean up linter issues, comment out weird code that fails for weird r…
Oct 13, 2021
b4240eb
Update dskit for the ring changes and un-comment check in test that i…
Oct 15, 2021
6bb5da8
formatting change for lifecycle_test
Oct 15, 2021
5448d48
Add ignored ring log message to prevent flakey test in TestMultitenan…
Oct 15, 2021
041d99e
Wrap basic lifecycler in the ruler
Oct 18, 2021
506dcd6
Merge remote-tracking branch 'origin/main' into dskit-ring
Oct 18, 2021
1d8088e
Ring module update
Oct 18, 2021
6aa6120
linter fixes
Oct 18, 2021
f61b104
remove kit/log from the mod and vendor file
Oct 18, 2021
27c4dd5
Update tests for go-kit/log changes
Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/golang/protobuf v1.5.2
github.com/golang/snappy v0.0.4
github.com/gorilla/mux v1.8.0
github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f
github.com/grafana/dskit v0.0.0-20211015163529-3a65fbdcfc45
github.com/hashicorp/go-hclog v0.12.2 // indirect
github.com/hashicorp/go-immutable-radix v1.2.0 // indirect
github.com/hashicorp/golang-lru v0.5.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,8 +904,8 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grafana/dskit v0.0.0-20210818123532-6645f87e9e12/go.mod h1:QaNAQaCSFOtG/NHf6Jd/zh67H25kkrVCq36U61Y2Mhw=
github.com/grafana/dskit v0.0.0-20210819132858-471020752967/go.mod h1:uF46UNN1/feB1egpq8UGbBBKvJjGgZauW7pcVbeFLLM=
github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f h1:FvvSVEbnGeM2bUivGmsiXTi8URJyBU7TcFEEoRe5wWI=
github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f/go.mod h1:uPG2nyK4CtgNDmWv7qyzYcdI+S90kHHRWvHnBtEMBXM=
github.com/grafana/dskit v0.0.0-20211015163529-3a65fbdcfc45 h1:MnEo2iaFbjxfkSVc1+apEOnGTJJBnV96YFl3K7wIsss=
github.com/grafana/dskit v0.0.0-20211015163529-3a65fbdcfc45/go.mod h1:uPG2nyK4CtgNDmWv7qyzYcdI+S90kHHRWvHnBtEMBXM=
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/prometheus-private v0.0.0-20211011121551-62935a12417d h1:VHtBAm2LCCWGum9VXkL1+WJbE/LZ7jLe1bc1O4xQsaM=
Expand Down
2 changes: 1 addition & 1 deletion pkg/alertmanager/alertmanager_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import (
"github.com/go-kit/log"
"github.com/grafana/dskit/crypto/tls"
"github.com/grafana/dskit/grpcclient"
"github.com/grafana/dskit/ring/client"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"google.golang.org/grpc"
"google.golang.org/grpc/health/grpc_health_v1"

treid314 marked this conversation as resolved.
Show resolved Hide resolved
"github.com/grafana/mimir/pkg/alertmanager/alertmanagerpb"
"github.com/grafana/mimir/pkg/ring/client"
)

// ClientsPool is the interface used to get the client from the pool for a specified address.
Expand Down
7 changes: 4 additions & 3 deletions pkg/alertmanager/alertmanager_ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ import (
"os"
"time"

"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv"
"github.com/grafana/dskit/ring"

"github.com/grafana/mimir/pkg/ring"
util_log "github.com/grafana/mimir/pkg/util/log"
)

Expand Down Expand Up @@ -99,8 +100,8 @@ func (cfg *RingConfig) RegisterFlags(f *flag.FlagSet) {

// ToLifecyclerConfig returns a LifecyclerConfig based on the alertmanager
// ring config.
func (cfg *RingConfig) ToLifecyclerConfig() (ring.BasicLifecyclerConfig, error) {
instanceAddr, err := ring.GetInstanceAddr(cfg.InstanceAddr, cfg.InstanceInterfaceNames)
func (cfg *RingConfig) ToLifecyclerConfig(logger log.Logger) (ring.BasicLifecyclerConfig, error) {
instanceAddr, err := ring.GetInstanceAddr(cfg.InstanceAddr, cfg.InstanceInterfaceNames, logger)
if err != nil {
return ring.BasicLifecyclerConfig{}, err
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/alertmanager/alertmanager_ring_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import (
"testing"
"time"

"github.com/grafana/dskit/ring"
"github.com/stretchr/testify/assert"

"github.com/grafana/mimir/pkg/ring"
)

func TestIsHealthyForAlertmanagerOperations(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/alertmanager/distributor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import (

"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/grafana/dskit/ring"
"github.com/grafana/dskit/ring/client"
"github.com/grafana/dskit/services"
"github.com/opentracing/opentracing-go"
"github.com/pkg/errors"
Expand All @@ -25,8 +27,6 @@ import (
"github.com/weaveworks/common/user"

"github.com/grafana/mimir/pkg/alertmanager/merger"
"github.com/grafana/mimir/pkg/ring"
"github.com/grafana/mimir/pkg/ring/client"
"github.com/grafana/mimir/pkg/tenant"
"github.com/grafana/mimir/pkg/util"
util_log "github.com/grafana/mimir/pkg/util/log"
Expand Down
4 changes: 2 additions & 2 deletions pkg/alertmanager/distributor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv"
"github.com/grafana/dskit/kv/consul"
"github.com/grafana/dskit/ring"
"github.com/grafana/dskit/services"
"github.com/grafana/dskit/test"
"github.com/prometheus/client_golang/prometheus"
Expand All @@ -33,7 +34,6 @@ import (
"google.golang.org/grpc/health/grpc_health_v1"

treid314 marked this conversation as resolved.
Show resolved Hide resolved
"github.com/grafana/mimir/pkg/alertmanager/alertmanagerpb"
"github.com/grafana/mimir/pkg/ring"
util_log "github.com/grafana/mimir/pkg/util/log"
)

Expand Down Expand Up @@ -327,7 +327,7 @@ func prepare(t *testing.T, numAM, numHappyAM, replicationFactor int, responseBod
},
HeartbeatTimeout: 60 * time.Minute,
ReplicationFactor: replicationFactor,
}, RingNameForServer, RingKey, nil)
}, RingNameForServer, RingKey, log.NewNopLogger(), nil)
require.NoError(t, err)
require.NoError(t, services.StartAndAwaitRunning(context.Background(), amRing))
test.Poll(t, time.Second, numAM, func() interface{} {
Expand Down
2 changes: 1 addition & 1 deletion pkg/alertmanager/lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package alertmanager

import (
"github.com/grafana/mimir/pkg/ring"
"github.com/grafana/dskit/ring"
)

func (r *MultitenantAlertmanager) OnRingInstanceRegister(_ *ring.BasicLifecycler, ringDesc ring.Desc, instanceExists bool, instanceID string, instanceDesc ring.InstanceDesc) (ring.InstanceState, ring.Tokens) {
Expand Down
14 changes: 5 additions & 9 deletions pkg/alertmanager/multitenant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (
"github.com/grafana/dskit/concurrency"
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv"
"github.com/grafana/dskit/ring"
"github.com/grafana/dskit/ring/client"
"github.com/grafana/dskit/services"
"github.com/pkg/errors"
"github.com/prometheus/alertmanager/cluster"
Expand All @@ -39,8 +41,6 @@ import (
"github.com/grafana/mimir/pkg/alertmanager/alertmanagerpb"
"github.com/grafana/mimir/pkg/alertmanager/alertspb"
"github.com/grafana/mimir/pkg/alertmanager/alertstore"
"github.com/grafana/mimir/pkg/ring"
"github.com/grafana/mimir/pkg/ring/client"
"github.com/grafana/mimir/pkg/tenant"
"github.com/grafana/mimir/pkg/util"
util_log "github.com/grafana/mimir/pkg/util/log"
Expand Down Expand Up @@ -404,7 +404,7 @@ func createMultitenantAlertmanager(cfg *MultitenantAlertmanagerConfig, fallbackC
}

if cfg.ShardingEnabled {
lifecyclerCfg, err := am.cfg.ShardingRing.ToLifecyclerConfig()
lifecyclerCfg, err := am.cfg.ShardingRing.ToLifecyclerConfig(am.logger)
if err != nil {
return nil, errors.Wrap(err, "failed to initialize Alertmanager's lifecycler config")
}
Expand All @@ -415,20 +415,16 @@ func createMultitenantAlertmanager(cfg *MultitenantAlertmanagerConfig, fallbackC
delegate = ring.NewLeaveOnStoppingDelegate(delegate, am.logger)
delegate = ring.NewAutoForgetDelegate(am.cfg.ShardingRing.HeartbeatTimeout*ringAutoForgetUnhealthyPeriods, delegate, am.logger)

am.ringLifecycler, err = ring.NewBasicLifecycler(lifecyclerCfg, RingNameForServer, RingKey, ringStore, delegate, am.logger, am.registry)
am.ringLifecycler, err = ring.NewBasicLifecycler(lifecyclerCfg, RingNameForServer, RingKey, ringStore, delegate, am.logger, prometheus.WrapRegistererWithPrefix("cortex_", am.registry))
if err != nil {
return nil, errors.Wrap(err, "failed to initialize Alertmanager's lifecycler")
}

am.ring, err = ring.NewWithStoreClientAndStrategy(am.cfg.ShardingRing.ToRingConfig(), RingNameForServer, RingKey, ringStore, ring.NewIgnoreUnhealthyInstancesReplicationStrategy())
am.ring, err = ring.NewWithStoreClientAndStrategy(am.cfg.ShardingRing.ToRingConfig(), RingNameForServer, RingKey, ringStore, ring.NewIgnoreUnhealthyInstancesReplicationStrategy(), prometheus.WrapRegistererWithPrefix("cortex_", am.registry), am.logger)
if err != nil {
return nil, errors.Wrap(err, "failed to initialize Alertmanager's ring")
}

if am.registry != nil {
am.registry.MustRegister(am.ring)
}

am.grpcServer = server.NewServer(&handlerForGRPCServer{am: am})

am.alertmanagerClientsPool = newAlertmanagerClientsPool(client.NewRingServiceDiscovery(am.ring), cfg.AlertmanagerClient, logger, am.registry)
Expand Down
2 changes: 1 addition & 1 deletion pkg/alertmanager/multitenant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/grafana/dskit/concurrency"
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv/consul"
"github.com/grafana/dskit/ring"
"github.com/grafana/dskit/services"
"github.com/grafana/dskit/test"
"github.com/prometheus/alertmanager/cluster/clusterpb"
Expand All @@ -50,7 +51,6 @@ import (
"github.com/grafana/mimir/pkg/alertmanager/alertspb"
"github.com/grafana/mimir/pkg/alertmanager/alertstore"
"github.com/grafana/mimir/pkg/alertmanager/alertstore/bucketclient"
"github.com/grafana/mimir/pkg/ring"
"github.com/grafana/mimir/pkg/storage/bucket"
"github.com/grafana/mimir/pkg/util"
"github.com/grafana/mimir/pkg/util/validation"
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/felixge/fgprof"
"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/grafana/dskit/ring"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/prometheus/storage"
"github.com/weaveworks/common/middleware"
Expand All @@ -35,7 +36,6 @@ import (
"github.com/grafana/mimir/pkg/ingester/client"
"github.com/grafana/mimir/pkg/mimirpb"
"github.com/grafana/mimir/pkg/querier"
"github.com/grafana/mimir/pkg/ring"
"github.com/grafana/mimir/pkg/ruler"
"github.com/grafana/mimir/pkg/scheduler"
"github.com/grafana/mimir/pkg/scheduler/schedulerpb"
Expand Down
6 changes: 3 additions & 3 deletions pkg/compactor/compactor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"github.com/go-kit/log/level"
"github.com/grafana/dskit/backoff"
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/ring"
"github.com/grafana/dskit/services"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"github.com/thanos-io/thanos/pkg/block"
"github.com/thanos-io/thanos/pkg/objstore"

"github.com/grafana/mimir/pkg/ring"
"github.com/grafana/mimir/pkg/storage/bucket"
mimir_tsdb "github.com/grafana/mimir/pkg/storage/tsdb"
"github.com/grafana/mimir/pkg/storage/tsdb/bucketindex"
Expand Down Expand Up @@ -382,12 +382,12 @@ func (c *MultitenantCompactor) starting(ctx context.Context) error {
// Initialize the compactors ring if sharding is enabled.
if c.compactorCfg.ShardingEnabled {
lifecyclerCfg := c.compactorCfg.ShardingRing.ToLifecyclerConfig()
c.ringLifecycler, err = ring.NewLifecycler(lifecyclerCfg, ring.NewNoopFlushTransferer(), "compactor", ring.CompactorRingKey, false, c.registerer)
c.ringLifecycler, err = ring.NewLifecycler(lifecyclerCfg, ring.NewNoopFlushTransferer(), "compactor", ring.CompactorRingKey, false, c.logger, prometheus.WrapRegistererWithPrefix("cortex_", c.registerer))
if err != nil {
return errors.Wrap(err, "unable to initialize compactor ring lifecycler")
}

c.ring, err = ring.New(lifecyclerCfg.RingConfig, "compactor", ring.CompactorRingKey, c.registerer)
c.ring, err = ring.New(lifecyclerCfg.RingConfig, "compactor", ring.CompactorRingKey, c.logger, prometheus.WrapRegistererWithPrefix("cortex_", c.registerer))
if err != nil {
return errors.Wrap(err, "unable to initialize compactor ring")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/compactor/compactor_ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/go-kit/log/level"
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv"
"github.com/grafana/dskit/ring"

"github.com/grafana/mimir/pkg/ring"
util_log "github.com/grafana/mimir/pkg/util/log"
)

Expand Down
3 changes: 1 addition & 2 deletions pkg/compactor/compactor_ring_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import (
"time"

"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/ring"
"github.com/stretchr/testify/assert"

"github.com/grafana/mimir/pkg/ring"
)

func TestRingConfig_DefaultConfigToLifecyclerConfig(t *testing.T) {
Expand Down
22 changes: 21 additions & 1 deletion pkg/compactor/compactor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/grafana/dskit/concurrency"
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv/consul"
"github.com/grafana/dskit/ring"
"github.com/grafana/dskit/services"
"github.com/grafana/dskit/test"
"github.com/oklog/ulid"
Expand All @@ -41,7 +42,6 @@ import (
"github.com/thanos-io/thanos/pkg/objstore"
"gopkg.in/yaml.v2"

"github.com/grafana/mimir/pkg/ring"
"github.com/grafana/mimir/pkg/storage/bucket"
mimir_tsdb "github.com/grafana/mimir/pkg/storage/tsdb"
"github.com/grafana/mimir/pkg/util/validation"
Expand Down Expand Up @@ -1249,6 +1249,22 @@ func findCompactorByUserID(compactors []*MultitenantCompactor, logs []*concurren
}

func removeIgnoredLogs(input []string) []string {
ignoredLogStringsMap := map[string]struct{}{
// Since we moved to the component logger from the global logger for the ring in dskit these lines are now expected but are just ring setup information.
`level=info component=compactor msg="ring doesn't exist in KV store yet"`: {},
`level=info component=compactor msg="not loading tokens from file, tokens file path is empty"`: {},
`level=info component=compactor msg="instance not found in ring, adding with no tokens" ring=compactor`: {},
`level=debug component=compactor msg="JoinAfter expired" ring=compactor`: {},
`level=info component=compactor msg="auto-joining cluster after timeout" ring=compactor`: {},
`level=info component=compactor msg="lifecycler loop() exited gracefully" ring=compactor`: {},
`level=info component=compactor msg="changing instance state from" old_state=ACTIVE new_state=LEAVING ring=compactor`: {},
`level=error component=compactor msg="failed to set state to LEAVING" ring=compactor err="Changing instance state from LEAVING -> LEAVING is disallowed"`: {},
`level=error component=compactor msg="failed to set state to LEAVING" ring=compactor err="Changing instance state from JOINING -> LEAVING is disallowed"`: {},
`level=debug component=compactor msg="unregistering instance from ring" ring=compactor`: {},
`level=info component=compactor msg="instance removed from the KV store" ring=compactor`: {},
`level=info component=compactor msg="observing tokens before going ACTIVE" ring=compactor`: {},
}

out := make([]string, 0, len(input))
durationRe := regexp.MustCompile(`\s?duration=\S+`)

Expand All @@ -1258,6 +1274,10 @@ func removeIgnoredLogs(input []string) []string {
continue
}

if _, exists := ignoredLogStringsMap[log]; exists {
continue
}

// Remove any duration from logs.
log = durationRe.ReplaceAllString(log, "")

Expand Down
8 changes: 4 additions & 4 deletions pkg/distributor/distributor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (
"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/grafana/dskit/limiter"
"github.com/grafana/dskit/ring"
ring_client "github.com/grafana/dskit/ring/client"
"github.com/grafana/dskit/services"
"github.com/opentracing/opentracing-go"
"github.com/pkg/errors"
Expand All @@ -36,8 +38,6 @@ import (
ingester_client "github.com/grafana/mimir/pkg/ingester/client"
"github.com/grafana/mimir/pkg/mimirpb"
"github.com/grafana/mimir/pkg/prom1/storage/metric"
"github.com/grafana/mimir/pkg/ring"
ring_client "github.com/grafana/mimir/pkg/ring/client"
"github.com/grafana/mimir/pkg/tenant"
"github.com/grafana/mimir/pkg/util"
"github.com/grafana/mimir/pkg/util/extract"
Expand Down Expand Up @@ -216,12 +216,12 @@ func New(cfg Config, clientConfig ingester_client.Config, limits *validation.Ove
if !canJoinDistributorsRing {
ingestionRateStrategy = newInfiniteIngestionRateStrategy()
} else if limits.IngestionRateStrategy() == validation.GlobalIngestionRateStrategy {
distributorsLifeCycler, err = ring.NewLifecycler(cfg.DistributorRing.ToLifecyclerConfig(), nil, "distributor", ring.DistributorRingKey, true, reg)
distributorsLifeCycler, err = ring.NewLifecycler(cfg.DistributorRing.ToLifecyclerConfig(), nil, "distributor", ring.DistributorRingKey, true, log, prometheus.WrapRegistererWithPrefix("cortex_", reg))
if err != nil {
return nil, err
}

distributorsRing, err = ring.New(cfg.DistributorRing.ToRingConfig(), "distributor", ring.DistributorRingKey, reg)
distributorsRing, err = ring.New(cfg.DistributorRing.ToRingConfig(), "distributor", ring.DistributorRingKey, log, prometheus.WrapRegistererWithPrefix("cortex_", reg))
if err != nil {
return nil, errors.Wrap(err, "failed to initialize distributors' ring client")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/distributor/distributor_ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/go-kit/log/level"
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv"
"github.com/grafana/dskit/ring"

"github.com/grafana/mimir/pkg/ring"
util_log "github.com/grafana/mimir/pkg/util/log"
)

Expand Down
3 changes: 1 addition & 2 deletions pkg/distributor/distributor_ring_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import (
"time"

"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/ring"
"github.com/stretchr/testify/assert"

"github.com/grafana/mimir/pkg/ring"
)

func TestRingConfig_DefaultConfigToLifecyclerConfig(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/distributor/distributor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv"
"github.com/grafana/dskit/kv/consul"
"github.com/grafana/dskit/ring"
ring_client "github.com/grafana/dskit/ring/client"
"github.com/grafana/dskit/services"
"github.com/grafana/dskit/test"
"github.com/prometheus/client_golang/prometheus"
Expand All @@ -42,8 +44,6 @@ import (
"github.com/grafana/mimir/pkg/ingester/client"
"github.com/grafana/mimir/pkg/mimirpb"
"github.com/grafana/mimir/pkg/prom1/storage/metric"
"github.com/grafana/mimir/pkg/ring"
ring_client "github.com/grafana/mimir/pkg/ring/client"
"github.com/grafana/mimir/pkg/tenant"
"github.com/grafana/mimir/pkg/util"
"github.com/grafana/mimir/pkg/util/chunkcompat"
Expand Down Expand Up @@ -1576,7 +1576,7 @@ func BenchmarkDistributor_Push(b *testing.B) {
KVStore: kv.Config{Mock: kvStore},
HeartbeatTimeout: 60 * time.Minute,
ReplicationFactor: 1,
}, ring.IngesterRingKey, ring.IngesterRingKey, nil)
}, ring.IngesterRingKey, ring.IngesterRingKey, log.NewNopLogger(), nil)
require.NoError(b, err)
require.NoError(b, services.StartAndAwaitRunning(context.Background(), ingestersRing))
b.Cleanup(func() {
Expand Down Expand Up @@ -2155,7 +2155,7 @@ func prepare(t *testing.T, cfg prepConfig) ([]*Distributor, []mockIngester, []*p
},
HeartbeatTimeout: 60 * time.Minute,
ReplicationFactor: rf,
}, ring.IngesterRingKey, ring.IngesterRingKey, nil)
}, ring.IngesterRingKey, ring.IngesterRingKey, log.NewNopLogger(), nil)
require.NoError(t, err)
require.NoError(t, services.StartAndAwaitRunning(context.Background(), ingestersRing))

Expand Down
Loading