Skip to content

Commit 3fc5b38

Browse files
yeya24alexqyle
yeya24
authored and
alexqyle
committed
Update prometheus to bring in head chunks improvement (cortexproject#5220)
* update prometheus to bring in head chunks improvement Signed-off-by: Ben Ye <[email protected]> * update changelog Signed-off-by: Ben Ye <[email protected]> --------- Signed-off-by: Ben Ye <[email protected]> Signed-off-by: Alex Le <[email protected]>
1 parent 0cc2860 commit 3fc5b38

File tree

248 files changed

+10950
-4833
lines changed

Some content is hidden

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

248 files changed

+10950
-4833
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* [CHANGE] Distributor/Ingester: Log warn level on push requests when they have status code 4xx. Do not log if status is 429. #5103
88
* [CHANGE] Tracing: Use the default OTEL trace sampler when `-tracing.otel.exporter-type` is set to `awsxray`. #5141
99
* [CHANGE] Ingester partial error log line to debug level. #5192
10+
* [CHANGE] Change HTTP status code from 503/422 to 499 if a request is canceled. #5220
1011
* [ENHANCEMENT] Update Go version to 1.19.3. #4988
1112
* [ENHANCEMENT] Querier: limit series query to only ingesters if `start` param is not specified. #4976
1213
* [ENHANCEMENT] Query-frontend/scheduler: add a new limit `frontend.max-outstanding-requests-per-tenant` for configuring queue size per tenant. Started deprecating two flags `-query-scheduler.max-outstanding-requests-per-tenant` and `-querier.max-outstanding-requests-per-tenant`, and change their value default to 0. Now if both the old flag and new flag are specified, the old flag's queue size will be picked. #5005

‎go.mod

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
99
github.com/alicebob/miniredis/v2 v2.30.0
1010
github.com/armon/go-metrics v0.4.1
11-
github.com/aws/aws-sdk-go v1.44.189
11+
github.com/aws/aws-sdk-go v1.44.217
1212
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
1313
github.com/cespare/xxhash v1.1.0
1414
github.com/cortexproject/promqlsmith v0.0.0-20230313010502-5c380a3b00b0
@@ -23,7 +23,7 @@ require (
2323
github.com/gogo/protobuf v1.3.2
2424
github.com/gogo/status v1.1.1
2525
github.com/golang-migrate/migrate/v4 v4.15.2
26-
github.com/golang/protobuf v1.5.2
26+
github.com/golang/protobuf v1.5.3
2727
github.com/golang/snappy v0.0.4
2828
github.com/gorilla/mux v1.8.0
2929
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd
@@ -45,9 +45,9 @@ require (
4545
github.com/prometheus/alertmanager v0.25.0
4646
github.com/prometheus/client_golang v1.14.0
4747
github.com/prometheus/client_model v0.3.0
48-
github.com/prometheus/common v0.41.0
48+
github.com/prometheus/common v0.42.0
4949
// Prometheus maps version 2.x.y to tags v0.x.y.
50-
github.com/prometheus/prometheus v0.42.0
50+
github.com/prometheus/prometheus v0.43.0-rc.0.0.20230315130038-58a8d526e8f1
5151
github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
5252
github.com/sony/gobreaker v0.5.0
5353
github.com/spf13/afero v1.9.3
@@ -63,15 +63,15 @@ require (
6363
go.opentelemetry.io/contrib/propagators/aws v1.14.0
6464
go.opentelemetry.io/otel v1.14.0
6565
go.opentelemetry.io/otel/bridge/opentracing v1.12.0
66-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0
67-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0
68-
go.opentelemetry.io/otel/sdk v1.13.0
66+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0
67+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0
68+
go.opentelemetry.io/otel/sdk v1.14.0
6969
go.opentelemetry.io/otel/trace v1.14.0
7070
go.uber.org/atomic v1.10.0
7171
golang.org/x/net v0.8.0
7272
golang.org/x/sync v0.1.0
7373
golang.org/x/time v0.3.0
74-
google.golang.org/grpc v1.52.3
74+
google.golang.org/grpc v1.53.0
7575
gopkg.in/yaml.v2 v2.4.0
7676
gopkg.in/yaml.v3 v3.0.1
7777
sigs.k8s.io/yaml v1.3.0
@@ -80,11 +80,11 @@ require (
8080
require github.com/google/go-cmp v0.5.9
8181

8282
require (
83-
cloud.google.com/go v0.105.0 // indirect
84-
cloud.google.com/go/compute v1.14.0 // indirect
83+
cloud.google.com/go v0.110.0 // indirect
84+
cloud.google.com/go/compute v1.18.0 // indirect
8585
cloud.google.com/go/compute/metadata v0.2.3 // indirect
86-
cloud.google.com/go/iam v0.8.0 // indirect
87-
cloud.google.com/go/storage v1.27.0 // indirect
86+
cloud.google.com/go/iam v0.12.0 // indirect
87+
cloud.google.com/go/storage v1.28.1 // indirect
8888
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0 // indirect
8989
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 // indirect
9090
github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.1 // indirect
@@ -93,7 +93,7 @@ require (
9393
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
9494
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
9595
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
96-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
96+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
9797
github.com/aws/aws-sdk-go-v2 v1.16.0 // indirect
9898
github.com/aws/aws-sdk-go-v2/config v1.15.1 // indirect
9999
github.com/aws/aws-sdk-go-v2/credentials v1.11.0 // indirect
@@ -111,40 +111,40 @@ require (
111111
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
112112
github.com/cespare/xxhash/v2 v2.2.0 // indirect
113113
github.com/coreos/go-semver v0.3.0 // indirect
114-
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
114+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
115115
github.com/davecgh/go-spew v1.1.1 // indirect
116116
github.com/dennwc/varint v1.0.0 // indirect
117117
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
118118
github.com/docker/go-units v0.5.0 // indirect
119119
github.com/edsrzf/mmap-go v1.1.0 // indirect
120120
github.com/efficientgo/tools/extkingpin v0.0.0-20220817170617-6c25e3b627dd // indirect
121-
github.com/fatih/color v1.13.0 // indirect
121+
github.com/fatih/color v1.14.1 // indirect
122122
github.com/felixge/httpsnoop v1.0.3 // indirect
123123
github.com/fsnotify/fsnotify v1.6.0 // indirect
124124
github.com/go-logfmt/logfmt v0.6.0 // indirect
125125
github.com/go-logr/logr v1.2.3 // indirect
126126
github.com/go-logr/stdr v1.2.2 // indirect
127127
github.com/go-openapi/analysis v0.21.4 // indirect
128128
github.com/go-openapi/errors v0.20.3 // indirect
129-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
130-
github.com/go-openapi/jsonreference v0.20.0 // indirect
129+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
130+
github.com/go-openapi/jsonreference v0.20.2 // indirect
131131
github.com/go-openapi/loads v0.21.2 // indirect
132132
github.com/go-openapi/runtime v0.25.0 // indirect
133-
github.com/go-openapi/spec v0.20.7 // indirect
134-
github.com/go-openapi/validate v0.22.0 // indirect
133+
github.com/go-openapi/spec v0.20.8 // indirect
134+
github.com/go-openapi/validate v0.22.1 // indirect
135135
github.com/gofrs/uuid v4.3.1+incompatible // indirect
136136
github.com/gogo/googleapis v1.4.0 // indirect
137-
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
137+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
138138
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
139139
github.com/google/btree v1.0.1 // indirect
140-
github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b // indirect
140+
github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 // indirect
141141
github.com/google/uuid v1.3.0 // indirect
142-
github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
142+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
143143
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
144144
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7 // indirect
145-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.1 // indirect
145+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
146146
github.com/hashicorp/errwrap v1.1.0 // indirect
147-
github.com/hashicorp/go-hclog v0.16.2 // indirect
147+
github.com/hashicorp/go-hclog v1.4.0 // indirect
148148
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
149149
github.com/hashicorp/go-msgpack v0.5.5 // indirect
150150
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -161,10 +161,10 @@ require (
161161
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
162162
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
163163
github.com/mailru/easyjson v0.7.7 // indirect
164-
github.com/mattn/go-colorable v0.1.12 // indirect
165-
github.com/mattn/go-isatty v0.0.14 // indirect
164+
github.com/mattn/go-colorable v0.1.13 // indirect
165+
github.com/mattn/go-isatty v0.0.17 // indirect
166166
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
167-
github.com/miekg/dns v1.1.50 // indirect
167+
github.com/miekg/dns v1.1.51 // indirect
168168
github.com/minio/md5-simd v1.1.2 // indirect
169169
github.com/minio/sha256-simd v1.0.0 // indirect
170170
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -177,9 +177,8 @@ require (
177177
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
178178
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
179179
github.com/prometheus/common/sigv4 v0.1.0 // indirect
180-
github.com/prometheus/exporter-toolkit v0.8.2 // indirect
180+
github.com/prometheus/exporter-toolkit v0.9.1 // indirect
181181
github.com/prometheus/procfs v0.9.0 // indirect
182-
github.com/rogpeppe/go-internal v1.9.0 // indirect
183182
github.com/rs/cors v1.8.2 // indirect
184183
github.com/rs/xid v1.4.0 // indirect
185184
github.com/rueian/rueidis v0.0.93 // indirect
@@ -193,34 +192,34 @@ require (
193192
github.com/vimeo/galaxycache v0.0.0-20210323154928-b7e5d71c067a // indirect
194193
github.com/weaveworks/promrus v1.2.0 // indirect
195194
github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect
196-
go.mongodb.org/mongo-driver v1.11.0 // indirect
195+
go.mongodb.org/mongo-driver v1.11.2 // indirect
197196
go.opencensus.io v0.24.0 // indirect
198-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0 // indirect
197+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
199198
go.opentelemetry.io/contrib/propagators/autoprop v0.38.0 // indirect
200199
go.opentelemetry.io/contrib/propagators/b3 v1.13.0 // indirect
201200
go.opentelemetry.io/contrib/propagators/jaeger v1.13.0 // indirect
202201
go.opentelemetry.io/contrib/propagators/ot v1.13.0 // indirect
203-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect
204-
go.opentelemetry.io/otel/metric v0.36.0 // indirect
202+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
203+
go.opentelemetry.io/otel/metric v0.37.0 // indirect
205204
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
206-
go.uber.org/goleak v1.2.0 // indirect
205+
go.uber.org/goleak v1.2.1 // indirect
207206
go.uber.org/multierr v1.9.0 // indirect
208207
go.uber.org/zap v1.21.0 // indirect
209208
go4.org/intern v0.0.0-20230205224052-192e9f60865c // indirect
210209
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296 // indirect
211-
golang.org/x/crypto v0.6.0 // indirect
212-
golang.org/x/exp v0.0.0-20230124195608-d38c7dcee874 // indirect
213-
golang.org/x/mod v0.8.0 // indirect
214-
golang.org/x/oauth2 v0.5.0 // indirect
210+
golang.org/x/crypto v0.7.0 // indirect
211+
golang.org/x/exp v0.0.0-20230307190834-24139beb5833 // indirect
212+
golang.org/x/mod v0.9.0 // indirect
213+
golang.org/x/oauth2 v0.6.0 // indirect
215214
golang.org/x/sys v0.6.0 // indirect
216215
golang.org/x/text v0.8.0 // indirect
217-
golang.org/x/tools v0.6.0 // indirect
216+
golang.org/x/tools v0.7.0 // indirect
218217
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
219218
gonum.org/v1/gonum v0.12.0 // indirect
220-
google.golang.org/api v0.108.0 // indirect
219+
google.golang.org/api v0.111.0 // indirect
221220
google.golang.org/appengine v1.6.7 // indirect
222-
google.golang.org/genproto v0.0.0-20230131230820-1c016267d619 // indirect
223-
google.golang.org/protobuf v1.28.1 // indirect
221+
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
222+
google.golang.org/protobuf v1.29.0 // indirect
224223
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
225224
gopkg.in/ini.v1 v1.67.0 // indirect
226225
)
@@ -246,8 +245,10 @@ replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.20.6
246245
// the v6.0.5851 Prometheus depends on doesn't seem to exist anymore?
247246
replace github.com/ionos-cloud/sdk-go/v6 => github.com/ionos-cloud/sdk-go/v6 v6.0.4
248247

249-
replace github.com/googleapis/gnostic => github.com/google/gnostic v0.6.9
248+
replace github.com/google/gnostic => github.com/googleapis/gnostic v0.6.9
250249

251250
// Same replace used by thanos: (may be removed in the future)
252251
// https://github.com/thanos-io/thanos/blob/fdeea3917591fc363a329cbe23af37c6fff0b5f0/go.mod#L265
253252
replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497
253+
254+
replace github.com/sercand/kuberesolver => github.com/sercand/kuberesolver/v4 v4.0.0

0 commit comments

Comments
 (0)