Update Prometheus to v0.40.1 #5896

rabenhorst · 2022-11-15T08:11:55Z

Update Prometheus to v0.40.1 without implementing native histograms.

I added CHANGELOG entry for this change.
Change is not relevant to the end user.

Changes

Updated prometheus to v0.40.1
Updated functions of iterators so that they implement the new chunkenc.Iterator interface and use chunkenc.ValueType
Adjusted querier tests to match expected results that slightly changed because of native histograms
Small changes to http server to make it work with latest web toolkit version
Update weaveworks common to prometheus v0.40.1

Verification

Existing unit and e2e tests

pkg/compact/downsample/downsample_test.go

pkg/dedup/iter.go

GiedriusS · 2022-11-16T08:12:21Z

pkg/query/querier_test.go

-					{T: 1587693300000, V: 14.23859649122807}, {T: 1587693400000, V: 15.407017543859647}, {T: 1587693500000, V: 15.915789473684208}, {T: 1587693600000, V: 15.712280701754386},
+					{T: 1587690300000, V: 13.652631578947368}, {T: 1587690400000, V: 14.049122807017543}, {T: 1587690500000, V: 13.961403508771928}, {T: 1587690600000, V: 13.617543859649121}, {T: 1587690700000, V: 14.568421052631578}, {T: 1587690800000, V: 14.989473684210525},
+					{T: 1587690900000, V: 16.2}, {T: 1587691000000, V: 16.052631578947366}, {T: 1587691100000, V: 15.831578947368419}, {T: 1587691200000, V: 15.659649122807016}, {T: 1587691300000, V: 14.842105263157894}, {T: 1587691400000, V: 14.003508771929823},
+					{T: 1587691500000, V: 13.782456140350876}, {T: 1587691600000, V: 13.86315789473684}, {T: 1587691700000, V: 15.270282598474376}, {T: 1587691800000, V: 14.343859649122805}, {T: 1587691900000, V: 13.975438596491227}, {T: 1587692000000, V: 13.399999999999999},


Interesting that the values have changed here 🤔

Adjusted querier tests to match expected results that slightly changed because of native histograms

Maybe you know why they have changed because of native histograms?

I remember having to update the extrapolatedRate function in the Thanos engine when updating Prometheus to 2.40.1. I was getting small differences related to floating point calculation since they changed the order of divisions/multiplications. It seems like these changes here are also on the last decimal points which could be the reason why the numbers need slight tweaks.

fpetkovski

Looks good overall. I wonder if we want to add support for native histograms in the vendored Cortex codebase. AFAIK we only use the query-frontend from Cortex, so maybe adding support there is not high priority.

saswatamcode

Thanks for awesome work! 🌟

One small question.

saswatamcode · 2022-11-16T08:32:49Z

pkg/server/http/http.go

@@ -75,7 +75,14 @@ func (s *Server) ListenAndServe() error {
 	if err != nil {
 		return errors.Wrap(err, "server could not be started")
 	}
-	return errors.Wrap(toolkit_web.ListenAndServe(s.srv, s.opts.tlsConfigPath, s.logger), "serve HTTP and metrics")
+
+	flags := &toolkit_web.FlagConfig{


I wonder if we should just import flags from exporter-toolkit and pass those options. There is https://pkg.go.dev/github.com/prometheus/exporter-toolkit@v0.8.1/web/kingpinflag#AddFlags

I think that would introduce more changes. I can do that in a separate followup PR. WDYT?

Yup, follow-up sounds good!

rabenhorst · 2022-12-13T19:16:33Z

@GiedriusS I added a test for both querying native histograms through sidecar and writing native histograms to receiver, to make sure there is no unexpected behavior (error for querying and noop for writing): rabenhorst#1

How I understand it: For querying through the sidecar we will get Error executing query: invalid chunk encoding "<unknown>" because the chunk encoding for histograms in Prometheus types is 2 and it is translated to 1 in Thanos which is invalid in Thanos and Prometheus returns error.
Regarding remote writes (to receivers) histogram does not exist in Thano's prompb type and is ignored.

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed pkg Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed internal Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Updated weaveworks/common Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed tests Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed some querier tests and commented out log spam Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed querier test Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Reverted tls integration test Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed TestChunkQueryable Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Implemented pushdownSeriesIterator AtT fn Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed cloudtrace import Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Ran go mod tidy Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> trigger tests Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

GiedriusS

Thanks for the tests and thorough explanation, I think you are correct 🙇 let's work on native histograms now and further improvements 💪 awesome work! Just a few last nits before merging this. Also, in the CHANGELOG I think we should add an item. Please explicitly note that native histograms are not supported and queries using them will fail with that error just like in the tests 😄

test/e2e/native_histograms_test.go

…s to v0.40.7 Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

GiedriusS · 2022-12-15T11:19:57Z

Damn, unlucky - Prometheus busybox sha256 changed 😄 Maybe you can update to the new hash https://quay.io/repository/prometheus/busybox/manifest/sha256:4ee0a8dced91db2c03eb2a69f20e95a41ad9602ebf3e6892b2666c02cf99cc78 so that e2e tests could run? We have a cronjob that periodically updates these but we can be faster in this PR 😄

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

rabenhorst · 2022-12-15T11:41:55Z

Damn, unlucky - Prometheus busybox sha256 changed 😄 Maybe you can update to the new hash https://quay.io/repository/prometheus/busybox/manifest/sha256:4ee0a8dced91db2c03eb2a69f20e95a41ad9602ebf3e6892b2666c02cf99cc78 so that e2e tests could run? We have a cronjob that periodically updates these but we can be faster in this PR 😄

Done :D

GiedriusS

💪 thanks for your contribution!

* Updated prometheus to v0.40.1 Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed pkg Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed internal Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Updated weaveworks/common Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed tests Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed some querier tests and commented out log spam Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed querier test Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Reverted tls integration test Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed TestChunkQueryable Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Implemented pushdownSeriesIterator AtT fn Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Fixed cloudtrace import Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Ran go mod tidy Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> trigger tests Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Uncommented log line Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Removed TODOs and fixed test message Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Updated prom engine Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Added missing nil check for delSeriesIterator and comment Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Fixed comment Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Started working on e2e tests Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Added native histograms e2e tests Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Updated Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Added license header to native histogram tests Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Added retry for TestQueryNativeHistograms Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Improved native histogram tests, added changelog and update prometheus to v0.40.7 Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Fixed changelog Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Removed trailing space from changelog Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> * Ran busy box updater Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com> Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

pull-request-size bot added the size/XL label Nov 15, 2022

rabenhorst force-pushed the prometheus-v0.40.x branch from eba04f4 to eed380e Compare November 15, 2022 08:13

rabenhorst changed the title ~~Update to prometheus v0.40.1~~ Update Prometheus to v0.40.1 Nov 15, 2022

pull-request-size bot added size/XXL size/XL and removed size/XL size/XXL labels Nov 15, 2022

rabenhorst force-pushed the prometheus-v0.40.x branch 2 times, most recently from d3e2175 to 0e4556c Compare November 15, 2022 21:38

pull-request-size bot added size/XXL and removed size/XL labels Nov 15, 2022

rabenhorst marked this pull request as ready for review November 15, 2022 22:16

GiedriusS reviewed Nov 16, 2022

View reviewed changes

pkg/compact/downsample/downsample_test.go Outdated Show resolved Hide resolved

GiedriusS reviewed Nov 16, 2022

View reviewed changes

pkg/compact/downsample/downsample_test.go Outdated Show resolved Hide resolved

GiedriusS reviewed Nov 16, 2022

View reviewed changes

pkg/dedup/iter.go Outdated Show resolved Hide resolved

GiedriusS reviewed Nov 16, 2022

View reviewed changes

fpetkovski reviewed Nov 16, 2022

View reviewed changes

saswatamcode previously approved these changes Nov 16, 2022

View reviewed changes

rabenhorst dismissed saswatamcode’s stale review via 04a2a46 November 16, 2022 12:57

rabenhorst force-pushed the prometheus-v0.40.x branch from 04a2a46 to 1d24694 Compare November 16, 2022 14:03

rabenhorst requested review from GiedriusS and saswatamcode and removed request for GiedriusS and saswatamcode November 16, 2022 14:04

rabenhorst dismissed matej-g’s stale review via 8ab9eb3 December 13, 2022 18:55

rabenhorst force-pushed the prometheus-v0.40.x branch from 8ab9eb3 to 06079ae Compare December 13, 2022 19:15

rabenhorst and others added 9 commits December 13, 2022 20:51

Uncommented log line

b8d0666

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Removed TODOs and fixed test message

073a1a6

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Updated prom engine

6bdd19a

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Added missing nil check for delSeriesIterator and comment

ee234a8

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Fixed comment

b5ae2d9

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Started working on e2e tests

6db24f1

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Added native histograms e2e tests

7de8e32

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Updated

c4099ba

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

rabenhorst force-pushed the prometheus-v0.40.x branch from 06079ae to c4099ba Compare December 13, 2022 20:30

rabenhorst added 2 commits December 13, 2022 21:50

Added license header to native histogram tests

ea23828

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Added retry for TestQueryNativeHistograms

e031d72

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

alanprot mentioned this pull request Dec 15, 2022

chore: Upgrade Prometheus from v0.39.1 to v2.40.7 #5971

Closed

2 tasks

GiedriusS previously approved these changes Dec 15, 2022

View reviewed changes

test/e2e/native_histograms_test.go Outdated Show resolved Hide resolved

test/e2e/native_histograms_test.go Outdated Show resolved Hide resolved

test/e2e/native_histograms_test.go Outdated Show resolved Hide resolved

Improved native histogram tests, added changelog and update prometheu…

624f880

…s to v0.40.7 Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

rabenhorst dismissed GiedriusS’s stale review via 624f880 December 15, 2022 09:40

rabenhorst added 2 commits December 15, 2022 11:53

Fixed changelog

14eaabf

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Removed trailing space from changelog

46a4bde

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Ran busy box updater

8ace1fb

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>

Merge branch 'main' into prometheus-v0.40.x

f1191b7

GiedriusS approved these changes Dec 16, 2022

View reviewed changes

GiedriusS merged commit 789046a into thanos-io:main Dec 16, 2022

saswatamcode mentioned this pull request Dec 20, 2022

Vulnerability in external dependencies #5982

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Prometheus to v0.40.1 #5896

Update Prometheus to v0.40.1 #5896

rabenhorst commented Nov 15, 2022 •

edited

Loading

GiedriusS Nov 16, 2022 •

edited

Loading

fpetkovski Nov 16, 2022

fpetkovski left a comment

saswatamcode left a comment

saswatamcode Nov 16, 2022

rabenhorst Nov 16, 2022

saswatamcode Nov 16, 2022

rabenhorst commented Dec 13, 2022 •

edited

Loading

GiedriusS left a comment

GiedriusS commented Dec 15, 2022 •

edited

Loading

rabenhorst commented Dec 15, 2022

GiedriusS left a comment

Update Prometheus to v0.40.1 #5896

Update Prometheus to v0.40.1 #5896

Conversation

rabenhorst commented Nov 15, 2022 • edited Loading

Changes

Verification

GiedriusS Nov 16, 2022 • edited Loading

Choose a reason for hiding this comment

fpetkovski Nov 16, 2022

Choose a reason for hiding this comment

fpetkovski left a comment

Choose a reason for hiding this comment

saswatamcode left a comment

Choose a reason for hiding this comment

saswatamcode Nov 16, 2022

Choose a reason for hiding this comment

rabenhorst Nov 16, 2022

Choose a reason for hiding this comment

saswatamcode Nov 16, 2022

Choose a reason for hiding this comment

rabenhorst commented Dec 13, 2022 • edited Loading

GiedriusS left a comment

Choose a reason for hiding this comment

GiedriusS commented Dec 15, 2022 • edited Loading

rabenhorst commented Dec 15, 2022

GiedriusS left a comment

Choose a reason for hiding this comment

rabenhorst commented Nov 15, 2022 •

edited

Loading

GiedriusS Nov 16, 2022 •

edited

Loading

rabenhorst commented Dec 13, 2022 •

edited

Loading

GiedriusS commented Dec 15, 2022 •

edited

Loading