Skip to content

Commit d8633ee

Browse files
committed
update weavewrworks
Signed-off-by: alanprot <[email protected]>
1 parent e3a8a4d commit d8633ee

File tree

19 files changed

+51
-81
lines changed

19 files changed

+51
-81
lines changed

go.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ require (
8080
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3
8181
github.com/cespare/xxhash/v2 v2.3.0
8282
github.com/google/go-cmp v0.6.0
83-
github.com/sercand/kuberesolver/v4 v4.0.0
83+
github.com/sercand/kuberesolver/v5 v5.1.1
8484
go.opentelemetry.io/collector/pdata v1.20.0
8585
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
8686
google.golang.org/protobuf v1.35.2
@@ -247,7 +247,7 @@ require (
247247
)
248248

249249
// Using cortex fork of weaveworks/common
250-
replace github.com/weaveworks/common => github.com/cortexproject/weaveworks-common v0.0.0-20241016153309-bf16f5f1d5c8
250+
replace github.com/weaveworks/common => github.com/cortexproject/weaveworks-common v0.0.0-20241129201713-7fa8414b9abd
251251

252252
// Override since git.apache.org is down. The docs say to fetch from github.
253253
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
@@ -273,8 +273,5 @@ replace github.com/google/gnostic => github.com/googleapis/gnostic v0.6.9
273273
// https://github.com/thanos-io/thanos/blob/fdeea3917591fc363a329cbe23af37c6fff0b5f0/go.mod#L265
274274
replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497
275275

276-
// Pin kuberesolver/v5 to support new grpc version. Need to upgrade kuberesolver version on weaveworks/common.
277-
replace github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v5 v5.1.1
278-
279276
// gRPC 1.66 introduced memory pooling which breaks Cortex queries. Pin 1.65.0 until we have a fix.
280277
replace google.golang.org/grpc => google.golang.org/grpc v1.65.0

go.sum

Lines changed: 2 additions & 45 deletions
Large diffs are not rendered by default.

pkg/tracing/tracing.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/go-kit/log/level"
1010
"github.com/pkg/errors"
11-
"github.com/sercand/kuberesolver/v4"
11+
"github.com/sercand/kuberesolver/v5"
1212
"github.com/weaveworks/common/tracing"
1313
"go.opentelemetry.io/contrib/propagators/aws/xray"
1414
"google.golang.org/grpc/credentials"
File renamed without changes.

0 commit comments

Comments
 (0)