Bump Cortex version

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## master / unreleased
 
 * [CHANGE] From path.Join to filepath.Join [#338](https://github.com/grafana/tempo/pull/338)
+* [CHANGE] Upgrade Cortex from v1.3.0 to v.1.4.0 [#341](https://github.com/grafana/tempo/pull/341)
 * [ENHANCEMENT] Add tempodb_compaction_objects_combined metric. [#339](https://github.com/grafana/tempo/pull/339)
 * [BUGFIX] Frequent errors logged by compactor regarding meta not found [#327](https://github.com/grafana/tempo/pull/327)
 

cmd/tempo/app/modules.go

@@ -178,7 +178,7 @@ func (t *App) initMemberlistKV() (services.Service, error) {
 	// todo: do we still need this?  does the package do this by default now?
 	t.cfg.MemberlistKV.NodeName = hostname + "-" + uuid.New().String()
 
-	t.memberlistKV = memberlist.NewKVInitService(&t.cfg.MemberlistKV)
+	t.memberlistKV = memberlist.NewKVInitService(&t.cfg.MemberlistKV, util.Logger)
 
 	t.cfg.Ingester.LifecyclerConfig.RingConfig.KVStore.MemberlistKV = t.memberlistKV.GetMemberlistKV
 	t.cfg.Distributor.DistributorRing.KVStore.MemberlistKV = t.memberlistKV.GetMemberlistKV

go.mod

@@ -6,7 +6,7 @@ require (
 	cloud.google.com/go/storage v1.6.0
 	contrib.go.opencensus.io/exporter/prometheus v0.2.0
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
-	github.com/cortexproject/cortex v1.3.0
+	github.com/cortexproject/cortex v1.4.0
 	github.com/go-kit/kit v0.10.0
 	github.com/gogo/protobuf v1.3.1
 	github.com/gogo/status v1.0.3
@@ -29,12 +29,12 @@ require (
 	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.11.1
-	github.com/prometheus/prometheus v1.8.2-0.20200722151933-4a8531a64b32
+	github.com/prometheus/prometheus v1.8.2-0.20200819132913-cb830b0a9c78
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.6.1
 	github.com/uber-go/atomic v1.4.0
-	github.com/weaveworks/common v0.0.0-20200820123129-280614068c5e
+	github.com/weaveworks/common v0.0.0-20200914083218-61ffdd448099
 	github.com/willf/bitset v1.1.10 // indirect
 	github.com/willf/bloom v2.0.3+incompatible
 	go.opencensus.io v0.22.3
@@ -63,6 +63,8 @@ replace (
 
 // additional Cortex or upstream required replaces
 replace (
+	github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab
+	github.com/opentracing-contrib/go-grpc => github.com/pracucci/go-grpc v0.0.0-20201022134131-ef559b8db645
 	github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0
-	k8s.io/client-go => k8s.io/client-go v0.18.3
+	k8s.io/client-go => k8s.io/client-go v0.19.2
 )

modules/distributor/distributor_test.go

@@ -418,6 +418,10 @@ func (r mockRing) IngesterCount() int {
 	return len(r.ingesters)
 }
 
-func (r mockRing) Subring(key uint32, n int) (ring.ReadRing, error) {
-	return r, nil
+func (r mockRing) HasInstance(instanceID string) bool {
+	return true
+}
+
+func (r mockRing) Subring(key uint32, n int) ring.ReadRing {
+	return r
 }