Skip to content

Commit 19b5a3a

Browse files
bborehamLeviHarrisonzenadorkrajorama
authored
Update to Mimir-Prometheus 0db77b4c7 (grafana#3682)
* Update mimir-prometheus to latest main 0db77b4c76da `tsdb/wal` was renamed to `tsdb/wlog`. Several other libraries were bumped by this, including prometheus/client-go and prometheus/exporter-toolkit. * go mod vendor * Update prometheus/alertmanager to latest 1b202b91bf26 Required to build against prometheus/exporter-toolkit. * Cope with Prometheus interface changes for Sparse Histograms Copied from the sparsehistograms branch. Co-authored-by: Levi Harrison <git@leviharrison.dev> Co-authored-by: Jeanette Tan <jeanette.tan@grafana.com> * Stop casting Prometheus points to Mimir samples They are no longer identical in memory layout. This puts up the cost of query sharding slightly. * Failsafe type handling in seriesSetToQueryResponse Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Apply review comments from grafana#3682 (grafana#3768) Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Fix wrong name of interface in comments Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Fix comments on chunk_merge_iterator.go Error out if iterator is asked to merge non float chunks: New/Seek merge Otherwise handle non floats normally Next and nonOverlaping Seek Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Do not handle multi type chunk in pkg/querier/batch/Batch (grafana#3800) The new code had issues and unknown performance. Mitigate risk by not handling histograms in Batches and restore the current way of working with additional checks to avoid histograms. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Instead of panicking just skip non floats from Batches This works out fine since the caller checks the ensuing batch.Length, thus propagating the emptiness of the iterator. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Simulate missing lazy eval of if condition in prometheus_chunk.Batch Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Skip unsupported values for now in tools/tsdb-chunks Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Skip unsupported types for now in tsdb-index-health Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Skip unsupported value types in tsdb-print-chunk Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Do not restrict test case iterations to floats implicitly Be explicit in asserts instead. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Apply review comments Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Apply review comments * Fix small issue from comments Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Levi Harrison <git@leviharrison.dev> Co-authored-by: Jeanette Tan <jeanette.tan@grafana.com> Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
1 parent 1c8cd69 commit 19b5a3a

143 files changed

Lines changed: 15190 additions & 1699 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.

go.mod

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/opentracing-contrib/go-stdlib v1.0.0
2828
github.com/opentracing/opentracing-go v1.2.0
2929
github.com/pkg/errors v0.9.1
30-
github.com/prometheus/alertmanager v0.24.1-0.20221130160919-c60fafa6025c
30+
github.com/prometheus/alertmanager v0.24.1-0.20221201154617-1b202b91bf26
3131
github.com/prometheus/client_golang v1.14.0
3232
github.com/prometheus/client_model v0.3.0
3333
github.com/prometheus/common v0.37.0
@@ -41,7 +41,7 @@ require (
4141
go.uber.org/atomic v1.10.0
4242
go.uber.org/goleak v1.2.0
4343
golang.org/x/crypto v0.1.0
44-
golang.org/x/net v0.1.0
44+
golang.org/x/net v0.2.0
4545
golang.org/x/sync v0.1.0
4646
golang.org/x/time v0.1.0
4747
google.golang.org/grpc v1.50.1
@@ -66,16 +66,17 @@ require (
6666
go.opentelemetry.io/otel v1.11.1
6767
go.opentelemetry.io/otel/trace v1.11.1
6868
go.uber.org/multierr v1.8.0
69-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
70-
golang.org/x/sys v0.1.0
71-
google.golang.org/api v0.100.0
69+
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326
70+
golang.org/x/sys v0.2.0
71+
google.golang.org/api v0.102.0
7272
gopkg.in/alecthomas/kingpin.v2 v2.2.6
7373
sigs.k8s.io/kustomize/kyaml v0.13.7
7474
)
7575

7676
require (
7777
cloud.google.com/go v0.105.0 // indirect
78-
cloud.google.com/go/compute v1.10.0 // indirect
78+
cloud.google.com/go/compute v1.12.1 // indirect
79+
cloud.google.com/go/compute/metadata v0.2.1 // indirect
7980
cloud.google.com/go/iam v0.6.0 // indirect
8081
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.0 // indirect
8182
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 // indirect
@@ -87,7 +88,7 @@ require (
8788
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
8889
github.com/armon/go-metrics v0.4.0 // indirect
8990
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
90-
github.com/aws/aws-sdk-go v1.44.109 // indirect
91+
github.com/aws/aws-sdk-go v1.44.131 // indirect
9192
github.com/aws/aws-sdk-go-v2 v1.16.0 // indirect
9293
github.com/aws/aws-sdk-go-v2/config v1.15.1 // indirect
9394
github.com/aws/aws-sdk-go-v2/credentials v1.11.0 // indirect
@@ -102,7 +103,7 @@ require (
102103
github.com/benbjohnson/clock v1.3.0 // indirect
103104
github.com/beorn7/perks v1.0.1 // indirect
104105
github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822 // indirect
105-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
106+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
106107
github.com/cespare/xxhash v1.1.0 // indirect
107108
github.com/cespare/xxhash/v2 v2.1.2 // indirect
108109
github.com/chromedp/cdproto v0.0.0-20220629234738-4cfc9cdeeb92 // indirect
@@ -113,7 +114,7 @@ require (
113114
github.com/dlclark/regexp2 v1.4.0 // indirect
114115
github.com/dnaeon/go-vcr v1.2.0 // indirect
115116
github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect
116-
github.com/docker/go-units v0.4.0 // indirect
117+
github.com/docker/go-units v0.5.0 // indirect
117118
github.com/efficientgo/e2e v0.13.1-0.20220923082810-8fa9daa8af8a // indirect
118119
github.com/efficientgo/tools/core v0.0.0-20220817170617-6c25e3b627dd // indirect
119120
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
@@ -138,7 +139,7 @@ require (
138139
github.com/google/btree v1.0.1 // indirect
139140
github.com/google/gnostic v0.5.7-v3refs // indirect
140141
github.com/google/go-querystring v1.1.0 // indirect
141-
github.com/google/pprof v0.0.0-20220829040838-70bd9ae97f40 // indirect
142+
github.com/google/pprof v0.0.0-20221102093814-76f304f74e5e // indirect
142143
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
143144
github.com/googleapis/gax-go/v2 v2.6.0 // indirect
144145
github.com/gosimple/slug v1.1.1 // indirect
@@ -206,10 +207,10 @@ require (
206207
go.opencensus.io v0.23.0 // indirect
207208
go.opentelemetry.io/collector v0.54.0 // indirect
208209
go.opentelemetry.io/collector/semconv v0.54.0 // indirect
209-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 // indirect
210-
go.opentelemetry.io/otel/metric v0.32.0 // indirect
210+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect
211+
go.opentelemetry.io/otel/metric v0.33.0 // indirect
211212
go.uber.org/zap v1.21.0 // indirect
212-
golang.org/x/mod v0.6.0 // indirect
213+
golang.org/x/mod v0.7.0 // indirect
213214
golang.org/x/oauth2 v0.1.0 // indirect
214215
golang.org/x/text v0.4.0 // indirect
215216
golang.org/x/tools v0.2.0 // indirect
@@ -228,7 +229,7 @@ require (
228229
replace github.com/bradfitz/gomemcache => github.com/grafana/gomemcache v0.0.0-20220812141943-44b6cde200bb
229230

230231
// Using a fork of Prometheus while we work on querysharding to avoid a dependency on the upstream.
231-
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20221011060152-c77b24bcb23f
232+
replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20221129151924-0db77b4c76da
232233

233234
// Pin hashicorp depencencies since the Prometheus fork, go mod tries to update them.
234235
replace github.com/hashicorp/go-immutable-radix => github.com/hashicorp/go-immutable-radix v1.2.0

0 commit comments

Comments
 (0)