Chore: Upgrade weaveworks/common

Signed-off-by: Arve Knudsen <[email protected]>

Author: aknuds1

go.mod

@@ -52,7 +52,7 @@ require (
 	github.com/stretchr/testify v1.7.0
 	github.com/thanos-io/thanos v0.22.0
 	github.com/uber/jaeger-client-go v2.29.1+incompatible
-	github.com/weaveworks/common v0.0.0-20210722103813-e649eff5ab4a
+	github.com/weaveworks/common v0.0.0-20210901124008-1fa3f9fa874c
 	go.etcd.io/bbolt v1.3.6
 	go.uber.org/atomic v1.9.0
 	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b

go.sum

@@ -1765,8 +1765,9 @@ github.com/weaveworks/common v0.0.0-20200914083218-61ffdd448099/go.mod h1:hz10LO
 github.com/weaveworks/common v0.0.0-20201119133501-0619918236ec/go.mod h1:ykzWac1LtVfOxdCK+jD754at1Ws9dKCwFeUzkFBffPs=
 github.com/weaveworks/common v0.0.0-20210112142934-23c8d7fa6120/go.mod h1:ykzWac1LtVfOxdCK+jD754at1Ws9dKCwFeUzkFBffPs=
 github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624/go.mod h1:ykzWac1LtVfOxdCK+jD754at1Ws9dKCwFeUzkFBffPs=
-github.com/weaveworks/common v0.0.0-20210722103813-e649eff5ab4a h1:ALomSnvy/NPeVoc4a1o7keaHHgLS76r9ZYIlwWWF+KA=
 github.com/weaveworks/common v0.0.0-20210722103813-e649eff5ab4a/go.mod h1:YU9FvnS7kUnRt6HY10G+2qHkwzP3n3Vb1XsXDsJTSp8=
+github.com/weaveworks/common v0.0.0-20210901124008-1fa3f9fa874c h1:+yzwVr4/12cUgsdjbEHq6MsKB7jWBZpZccAP6xvqTzQ=
+github.com/weaveworks/common v0.0.0-20210901124008-1fa3f9fa874c/go.mod h1:YU9FvnS7kUnRt6HY10G+2qHkwzP3n3Vb1XsXDsJTSp8=
 github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M=
 github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
 github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=

pkg/chunk/cache/memcached.go

@@ -24,9 +24,9 @@ type observableVecCollector struct {
 	v prometheus.ObserverVec
 }
 
-func (observableVecCollector) Register()                             {}
-func (observableVecCollector) Before(method string, start time.Time) {}
-func (o observableVecCollector) After(method, statusCode string, start time.Time) {
+func (observableVecCollector) Register()                                                  {}
+func (observableVecCollector) Before(ctx context.Context, method string, start time.Time) {}
+func (o observableVecCollector) After(ctx context.Context, method, statusCode string, start time.Time) {
 	o.v.WithLabelValues(method, statusCode).Observe(time.Since(start).Seconds())
 }
 

pkg/querier/queryrange/instrumentation.go

@@ -58,7 +58,7 @@ type NoopCollector struct{}
 func (c *NoopCollector) Register() {}
 
 // Before implements instrument.Collector.
-func (c *NoopCollector) Before(method string, start time.Time) {}
+func (c *NoopCollector) Before(ctx context.Context, method string, start time.Time) {}
 
 // After implements instrument.Collector.
-func (c *NoopCollector) After(method, statusCode string, start time.Time) {}
+func (c *NoopCollector) After(ctx context.Context, method, statusCode string, start time.Time) {}

pkg/util/log/wrappers.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/go-kit/kit/log"
 	kitlog "github.com/go-kit/kit/log"
-	"github.com/weaveworks/common/middleware"
+	"github.com/weaveworks/common/tracing"
 
 	"github.com/cortexproject/cortex/pkg/tenant"
 )
@@ -38,7 +38,7 @@ func WithContext(ctx context.Context, l kitlog.Logger) kitlog.Logger {
 		l = WithUserID(userID, l)
 	}
 
-	traceID, ok := middleware.ExtractTraceID(ctx)
+	traceID, ok := tracing.ExtractTraceID(ctx)
 	if !ok {
 		return l
 	}