Skip to content

Commit ba859e7

Browse files
authored
Upgrade grpc to v1.79.3 (#7463)
* Upgrade grpc to v1.79.3 Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * Adding List Method Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> --------- Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
1 parent bd573c3 commit ba859e7

430 files changed

Lines changed: 34115 additions & 16644 deletions

File tree

Some content is hidden

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

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* [ENHANCEMENT] Query Scheduler: Add `cortex_query_scheduler_tracked_requests` metric to track the current number of requests held by the scheduler. #7355
1717
* [ENHANCEMENT] Compactor: Prevent partition compaction to compact any blocks marked for deletion. #7391
1818
* [ENHANCEMENT] Distributor: Optimize memory allocations by reusing the existing capacity of these pooled slices in the Prometheus Remote Write 2.0 path. #7392
19+
* [ENHANCEMENT] Upgrade gRPC from v1.71.2 to v1.79.3 to address CVE-2026-33186. #7460
1920
* [BUGFIX] Querier: Fix queryWithRetry and labelsWithRetry returning (nil, nil) on cancelled context by propagating ctx.Err(). #7370
2021
* [BUGFIX] Metrics Helper: Fix non-deterministic bucket order in merged histograms by sorting buckets after map iteration, matching Prometheus client library behavior. #7380
2122
* [BUGFIX] Distributor: Return HTTP 401 Unauthorized when tenant ID resolution fails in the Prometheus Remote Write 2.0 path. #7389

go.mod

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ require (
6868
golang.org/x/net v0.49.0
6969
golang.org/x/sync v0.19.0
7070
golang.org/x/time v0.14.0
71-
google.golang.org/grpc v1.78.0
71+
google.golang.org/grpc v1.79.3
7272
gopkg.in/yaml.v2 v2.4.0
7373
gopkg.in/yaml.v3 v3.0.1
7474
)
@@ -100,7 +100,7 @@ require (
100100
)
101101

102102
require (
103-
cel.dev/expr v0.24.0 // indirect
103+
cel.dev/expr v0.25.1 // indirect
104104
cloud.google.com/go v0.120.0 // indirect
105105
cloud.google.com/go/auth v0.17.0 // indirect
106106
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
@@ -139,7 +139,7 @@ require (
139139
github.com/caio/go-tdigest v3.1.0+incompatible // indirect
140140
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
141141
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
142-
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
142+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
143143
github.com/coder/quartz v0.3.0 // indirect
144144
github.com/coreos/go-semver v0.3.0 // indirect
145145
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
@@ -150,13 +150,14 @@ require (
150150
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
151151
github.com/docker/go-units v0.5.0 // indirect
152152
github.com/efficientgo/tools/extkingpin v0.0.0-20230505153745-6b7392939a60 // indirect
153-
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
154-
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
153+
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
154+
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
155155
github.com/fatih/color v1.18.0 // indirect
156156
github.com/felixge/httpsnoop v1.0.4 // indirect
157157
github.com/fsnotify/fsnotify v1.9.0 // indirect
158158
github.com/go-chi/chi/v5 v5.2.2 // indirect
159159
github.com/go-ini/ini v1.67.0 // indirect
160+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
160161
github.com/go-logfmt/logfmt v0.6.0 // indirect
161162
github.com/go-logr/logr v1.4.3 // indirect
162163
github.com/go-logr/stdr v1.2.2 // indirect
@@ -255,6 +256,7 @@ require (
255256
github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 // indirect
256257
github.com/sirupsen/logrus v1.9.3 // indirect
257258
github.com/soheilhy/cmux v0.1.5 // indirect
259+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
258260
github.com/stretchr/objx v0.5.2 // indirect
259261
github.com/tinylib/msgp v1.6.1 // indirect
260262
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
@@ -273,7 +275,7 @@ require (
273275
go.opentelemetry.io/collector/pipeline v1.45.0 // indirect
274276
go.opentelemetry.io/collector/processor v1.45.0 // indirect
275277
go.opentelemetry.io/collector/semconv v0.128.0 // indirect
276-
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
278+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
277279
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
278280
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.64.0 // indirect
279281
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
@@ -338,9 +340,6 @@ replace github.com/google/gnostic => github.com/googleapis/gnostic v0.6.9
338340
// https://github.com/thanos-io/thanos/blob/fdeea3917591fc363a329cbe23af37c6fff0b5f0/go.mod#L265
339341
replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497
340342

341-
// Wait for fix for https://github.com/grpc/grpc-go/pull/8504.
342-
replace google.golang.org/grpc => google.golang.org/grpc v1.71.2
343-
344343
// See https://github.com/envoyproxy/go-control-plane/issues/1083 as this version introduces checksum mismatch.
345344
exclude github.com/envoyproxy/go-control-plane/envoy v1.32.3
346345

go.sum

Lines changed: 75 additions & 1210 deletions
Large diffs are not rendered by default.

pkg/ring/client/pool_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ func (i mockClient) Watch(ctx context.Context, in *grpc_health_v1.HealthCheckReq
3636
return nil, status.Error(codes.Unimplemented, "Watching is not supported")
3737
}
3838

39+
func (i mockClient) List(ctx context.Context, in *grpc_health_v1.HealthListRequest, opts ...grpc.CallOption) (*grpc_health_v1.HealthListResponse, error) {
40+
return nil, status.Error(codes.Unimplemented, "Listing is not supported")
41+
}
42+
3943
func TestHealthCheck(t *testing.T) {
4044
tcs := []struct {
4145
client mockClient

pkg/util/grpcutil/health_check.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ func (h *HealthCheck) Watch(_ *grpc_health_v1.HealthCheckRequest, _ grpc_health_
3737
return status.Error(codes.Unimplemented, "Watching is not supported")
3838
}
3939

40+
// List implements the grpc healthcheck.
41+
func (h *HealthCheck) List(_ context.Context, _ *grpc_health_v1.HealthListRequest) (*grpc_health_v1.HealthListResponse, error) {
42+
return nil, status.Error(codes.Unimplemented, "Listing is not supported")
43+
}
44+
4045
// isHealthy returns whether the instance should be considered healthy.
4146
func (h *HealthCheck) isHealthy() bool {
4247
states := h.sm.ServicesByState()

pkg/util/tls/test/tls_integration_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ func (h *grpcHealthCheck) Watch(_ *grpc_health_v1.HealthCheckRequest, _ grpc_hea
5151
return status.Error(codes.Unimplemented, "Watching is not supported")
5252
}
5353

54+
func (h *grpcHealthCheck) List(_ context.Context, _ *grpc_health_v1.HealthListRequest) (*grpc_health_v1.HealthListResponse, error) {
55+
return nil, status.Error(codes.Unimplemented, "Listing is not supported")
56+
}
57+
5458
func getLocalHostPort() (int, func() error, error) {
5559
addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
5660
if err != nil {

vendor/cel.dev/expr/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/cel.dev/expr/MODULE.bazel

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

0 commit comments

Comments
 (0)