Skip to content

Commit 25ed6e4

Browse files
alexqylealexqyle
authored
Upgrade Thanos to latest main (#5629)
* Upgrade Thanos to latest main Signed-off-by: Alex Le <[email protected]> * Pin google.golang.org/grpc to v1.56.2 Signed-off-by: Alex Le <[email protected]> --------- Signed-off-by: Alex Le <[email protected]>
1 parent 752c354 commit 25ed6e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+9069
-1514
lines changed

‎go.mod‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,24 @@ require (
5353
github.com/stretchr/testify v1.8.4
5454
github.com/thanos-io/objstore v0.0.0-20230921130928-63a603e651ed
5555
github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591
56-
github.com/thanos-io/thanos v0.32.5-0.20231023172853-513272e70874
56+
github.com/thanos-io/thanos v0.32.5-0.20231103115946-463a6ce8b53c
5757
github.com/uber/jaeger-client-go v2.30.0+incompatible
5858
github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d
5959
go.etcd.io/etcd/api/v3 v3.5.9
6060
go.etcd.io/etcd/client/pkg/v3 v3.5.9
6161
go.etcd.io/etcd/client/v3 v3.5.7
6262
go.opentelemetry.io/contrib/propagators/aws v1.17.0
63-
go.opentelemetry.io/otel v1.16.0
64-
go.opentelemetry.io/otel/bridge/opentracing v1.16.0
65-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0
66-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
67-
go.opentelemetry.io/otel/sdk v1.16.0
68-
go.opentelemetry.io/otel/trace v1.16.0
63+
go.opentelemetry.io/otel v1.19.0
64+
go.opentelemetry.io/otel/bridge/opentracing v1.19.0
65+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
66+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
67+
go.opentelemetry.io/otel/sdk v1.19.0
68+
go.opentelemetry.io/otel/trace v1.19.0
6969
go.uber.org/atomic v1.11.0
7070
golang.org/x/net v0.17.0
7171
golang.org/x/sync v0.3.0
7272
golang.org/x/time v0.3.0
73-
google.golang.org/grpc v1.56.2
73+
google.golang.org/grpc v1.58.2
7474
gopkg.in/yaml.v2 v2.4.0
7575
gopkg.in/yaml.v3 v3.0.1
7676
sigs.k8s.io/yaml v1.3.0
@@ -203,13 +203,12 @@ require (
203203
go.opencensus.io v0.24.0 // indirect
204204
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 // indirect
205205
go.opentelemetry.io/collector/semconv v0.81.0 // indirect
206-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
206+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
207207
go.opentelemetry.io/contrib/propagators/autoprop v0.38.0 // indirect
208208
go.opentelemetry.io/contrib/propagators/b3 v1.13.0 // indirect
209209
go.opentelemetry.io/contrib/propagators/jaeger v1.13.0 // indirect
210210
go.opentelemetry.io/contrib/propagators/ot v1.13.0 // indirect
211-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
212-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
211+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
213212
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
214213
go.uber.org/goleak v1.2.1 // indirect
215214
go.uber.org/multierr v1.11.0 // indirect
@@ -263,3 +262,6 @@ replace github.com/google/gnostic => github.com/googleapis/gnostic v0.6.9
263262
replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497
264263

265264
replace github.com/sercand/kuberesolver => github.com/sercand/kuberesolver/v4 v4.0.0
265+
266+
// v1.58.2 caused compile error on github.com/sercand/kuberesolver (even on v5.1.1)
267+
replace google.golang.org/grpc => google.golang.org/grpc v1.56.2

‎go.sum‎

Lines changed: 389 additions & 90 deletions
Large diffs are not rendered by default.

‎vendor/github.com/thanos-io/thanos/pkg/block/fetcher.go‎

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/thanos-io/thanos/pkg/block/index.go‎

Lines changed: 23 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/thanos-io/thanos/pkg/block/indexheader/binary_reader.go‎

Lines changed: 40 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/thanos-io/thanos/pkg/block/indexheader/lazy_binary_reader.go‎

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/thanos-io/thanos/pkg/block/indexheader/reader_pool.go‎

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)