Fixed issues after rebasing master

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Author: pracucci

go.mod

@@ -67,7 +67,7 @@ require (
 	go.etcd.io/bbolt v1.3.3
 	go.etcd.io/etcd v0.0.0-20190709142735-eb7dd97135a5
 	golang.org/x/net v0.0.0-20190923162816-aa69164e4478
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	google.golang.org/api v0.11.0
 	google.golang.org/grpc v1.25.1
 	gopkg.in/yaml.v2 v2.2.2

pkg/ring/lifecycler_test.go

@@ -332,7 +332,7 @@ func TestTokensOnDisk(t *testing.T) {
 	flagext.DefaultValues(&ringConfig)
 	ringConfig.KVStore.Mock = consul.NewInMemoryClient(GetCodec())
 
-	r, err := New(ringConfig, "ingester")
+	r, err := New(ringConfig, "ingester", IngesterRingKey)
 	require.NoError(t, err)
 	defer r.Stop()
 
@@ -348,13 +348,13 @@ func TestTokensOnDisk(t *testing.T) {
 	lifecyclerConfig.NormaliseTokens = true
 
 	// Start first ingester.
-	l1, err := NewLifecycler(lifecyclerConfig, &noopFlushTransferer{}, "ingester")
+	l1, err := NewLifecycler(lifecyclerConfig, &noopFlushTransferer{}, "ingester", IngesterRingKey)
 	require.NoError(t, err)
 	l1.Start()
 	// Check this ingester joined, is active, and has 512 token.
 	var expTokens []uint32
 	test.Poll(t, 1000*time.Millisecond, true, func() interface{} {
-		d, err := r.KVClient.Get(context.Background(), ConsulKey)
+		d, err := r.KVClient.Get(context.Background(), IngesterRingKey)
 		require.NoError(t, err)
 		desc, ok := d.(*Desc)
 		if ok {
@@ -371,15 +371,15 @@ func TestTokensOnDisk(t *testing.T) {
 
 	// Start new ingester at same token directory.
 	lifecyclerConfig.ID = "ing2"
-	l2, err := NewLifecycler(lifecyclerConfig, &noopFlushTransferer{}, "ingester")
+	l2, err := NewLifecycler(lifecyclerConfig, &noopFlushTransferer{}, "ingester", IngesterRingKey)
 	require.NoError(t, err)
 	l2.Start()
 	defer l2.Shutdown()
 
 	// Check this ingester joined, is active, and has 512 token.
 	var actTokens []uint32
 	test.Poll(t, 1000*time.Millisecond, true, func() interface{} {
-		d, err := r.KVClient.Get(context.Background(), ConsulKey)
+		d, err := r.KVClient.Get(context.Background(), IngesterRingKey)
 		require.NoError(t, err)
 		desc, ok := d.(*Desc)
 		if ok {