Vendor update mimir-prometheus at af2a1cb10c89de496cd4309ac532624b34112d74 #10188

krajorama · 2024-12-09T12:45:11Z

What this PR does

This is upstream at
https://github.com/prometheus/prometheus/tree/af2a1cb10c89de496cd4309ac532624b34112d74

Changes listed in
grafana/mimir-prometheus#787

Fixed query sharding test TestQuerySharding_FunctionCorrectness failing due to prometheus/prometheus#15479.

Which issue(s) this PR fixes or relates to

N/A

Checklist

Tests updated.
Documentation added.
CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
about-versioning.md updated with experimental features.

…24206 This is upstream at https://github.com/prometheus/prometheus/tree/af2a1cb10c89de496cd4309ac532624b34112d74 Changes listed in grafana/mimir-prometheus#787 Signed-off-by: György Krajcsovits <[email protected]>

Signed-off-by: György Krajcsovits <[email protected]>

charleskorn · 2024-12-10T03:53:47Z

pkg/streamingpromql/operators/functions/range_vectors.go

What if we introduced something like InstantVectorSeriesDataIterator, but for iterating over a RangeVectorStepData? I think that would simplify a lot of the logic here, and more clearly separate the iteration logic from the resets / changes logic.

I had thought about that too. I'm happy to do it, but shall we do it as a follow up PR?

Up to you, I'm happy either way.

I'll do it as a followup 👍

jesusvazquez · 2024-12-10T17:16:09Z

I'm trying to add two reverts here #10203 maybe we could combine the effort @krajorama

charleskorn

Approving MQE changes to unblock this, but I'd like to see the change suggested here applied in a follow up PR, and I'd also like to see us use the exported functions from prometheus/prometheus#15190 in a follow up PR as well.

No need to test query sharding on time functions for native histograms since prometheus/prometheus#15479 . As those functions do not return samples on native histograms. Signed-off-by: György Krajcsovits <[email protected]>

Looked through changes from #10102, #10123, #10136, #10168, #10188 Signed-off-by: György Krajcsovits <[email protected]>

krajorama · 2024-12-11T07:37:01Z

CHANGELOG.md

@@ -103,6 +103,15 @@
 * [BUGFIX] Querier: Fix stddev+stdvar aggregations to treat Infinity consistently. #9844
 * [BUGFIX] Ingester: Chunks could have one unnecessary zero byte at the end. #9844
 * [BUGFIX] OTLP receiver: Preserve colons and combine multiple consecutive underscores into one when generating metric names in suffix adding mode (`-distributor.otel-metric-suffixes-enabled`). #10075
+* [BUGFIX] PromQL: Ignore native histograms in `clamp`, `clamp_max` and `clamp_min` functions. #10136


Note to reviewers: native histograms is an experimental feature, so these don't count as CHANGE as they just fix the code to follow the spec. @beorn7

krajorama · 2024-12-11T07:40:06Z

pkg/frontend/querymiddleware/querysharding_test.go

@@ -988,15 +988,8 @@ func TestQuerySharding_FunctionCorrectness(t *testing.T) {

 	testsForBoth := []queryShardingFunctionCorrectnessTest{
 		{fn: "count_over_time", rangeQuery: true},
-		{fn: "days_in_month"},


Note to reviewers: due to prometheus/prometheus#15479

krajorama · 2024-12-11T07:43:45Z

I'm trying to add two reverts here #10203 maybe we could combine the effort @krajorama

We'll follow up in separate PR. Let this be pure Prometheus upstream update.

CHANGELOG.md

jhesketh

LGTM, thanks!

jesusvazquez

LGTM

beorn7

Some small things…

beorn7 · 2024-12-11T10:32:15Z

CHANGELOG.md

@@ -103,6 +103,15 @@
 * [BUGFIX] Querier: Fix stddev+stdvar aggregations to treat Infinity consistently. #9844
 * [BUGFIX] Ingester: Chunks could have one unnecessary zero byte at the end. #9844
 * [BUGFIX] OTLP receiver: Preserve colons and combine multiple consecutive underscores into one when generating metric names in suffix adding mode (`-distributor.otel-metric-suffixes-enabled`). #10075
+* [BUGFIX] PromQL: Ignore native histograms in `clamp`, `clamp_max` and `clamp_min` functions. #10136
+* [BUGFIX] PromQL: Ignore native histograms in `max`, `min`, `stdvar`, `stddev` functions and instead return an info annotation. #10136


Nit: These are aggregation operators, not functions.

beorn7 · 2024-12-11T10:34:07Z

CHANGELOG.md

+* [BUGFIX] PromQL: Ignore native histograms in `max`, `min`, `stdvar`, `stddev` functions and instead return an info annotation. #10136
+* [BUGFIX] PromQL: Ignore native histograms when compared to float values with `==`, `!=`, `<`, `>`, `<=`, `>=` and instead return an info annotation. #10136
+* [BUGFIX] PromQL: Return an info annotation if the `quantile` function is used on a float series that does not have `le` label. #10136
+* [BUGFIX] PromQL: Fix `count_values` not taking into account native histograms. #10168


count_values does take native histograms into account with the recent fix. See prometheus/prometheus#15422

lol, unfortunate wording :)

beorn7 · 2024-12-11T10:34:50Z

CHANGELOG.md

+* [BUGFIX] PromQL: Ignore native histograms when compared to float values with `==`, `!=`, `<`, `>`, `<=`, `>=` and instead return an info annotation. #10136
+* [BUGFIX] PromQL: Return an info annotation if the `quantile` function is used on a float series that does not have `le` label. #10136
+* [BUGFIX] PromQL: Fix `count_values` not taking into account native histograms. #10168
+* [BUGFIX] PromQL: Ignore native histograms in time functions `day_of_month`, `day_of_week`, `day_of_year`, `days_in_month`, `hour`, `minute`, `month` and `year`, which means they no longer any value when encountering a native histograms series. #10188


A word is missing here, like "yield" or "return".

@beorn7 updated the descriptions, thank you.

Signed-off-by: György Krajcsovits <[email protected]>

beorn7

For NH/PromQL part.

# Conflicts: # pkg/distributor/otel_test.go

krajorama and others added 4 commits December 9, 2024 13:42

make generate-otlp

6c8d821

Signed-off-by: György Krajcsovits <[email protected]>

Sync upstream tests

e5842fd

Fix and improve changes/resets functions

1307f18

charleskorn reviewed Dec 10, 2024

View reviewed changes

jesusvazquez mentioned this pull request Dec 10, 2024

Vendor update mimir-prometheus at 0a0a41616520101ffd29c38f167b36898f08019d #10203

Merged

charleskorn approved these changes Dec 11, 2024

View reviewed changes

krajorama added 2 commits December 11, 2024 08:07

fix(test): time functions ignore native histograms

a59c972

No need to test query sharding on time functions for native histograms since prometheus/prometheus#15479 . As those functions do not return samples on native histograms. Signed-off-by: György Krajcsovits <[email protected]>

Update changelog retroactively

325c79f

Looked through changes from #10102, #10123, #10136, #10168, #10188 Signed-off-by: György Krajcsovits <[email protected]>

krajorama marked this pull request as ready for review December 11, 2024 07:33

krajorama requested review from stevesg, grafanabot and a team as code owners December 11, 2024 07:33

krajorama commented Dec 11, 2024

View reviewed changes

aknuds1 approved these changes Dec 11, 2024

View reviewed changes

jhesketh reviewed Dec 11, 2024

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

jhesketh reviewed Dec 11, 2024

View reviewed changes

CHANGELOG.md Show resolved Hide resolved

jhesketh approved these changes Dec 11, 2024

View reviewed changes

jesusvazquez approved these changes Dec 11, 2024

View reviewed changes

krajorama mentioned this pull request Dec 11, 2024

chore(otel_test): rework test to prep for keep id resource attributes #10212

Merged

1 task

beorn7 requested changes Dec 11, 2024

View reviewed changes

Fixup changelog

da2d9df

Signed-off-by: György Krajcsovits <[email protected]>

beorn7 approved these changes Dec 11, 2024

View reviewed changes

Merge branch 'main' into krajo/update-mimir-prometheus

72a7854

# Conflicts: # pkg/distributor/otel_test.go

krajorama enabled auto-merge (squash) December 11, 2024 11:33

krajorama merged commit 06689ae into main Dec 11, 2024
29 checks passed

krajorama deleted the krajo/update-mimir-prometheus branch December 11, 2024 11:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vendor update mimir-prometheus at af2a1cb10c89de496cd4309ac532624b34112d74 #10188

Vendor update mimir-prometheus at af2a1cb10c89de496cd4309ac532624b34112d74 #10188

krajorama commented Dec 9, 2024 •

edited

Loading

charleskorn Dec 10, 2024

jhesketh Dec 10, 2024

charleskorn Dec 10, 2024

jhesketh Dec 11, 2024

jesusvazquez commented Dec 10, 2024 •

edited

Loading

charleskorn left a comment

krajorama Dec 11, 2024 •

edited

Loading

krajorama Dec 11, 2024

krajorama commented Dec 11, 2024

jhesketh left a comment

jesusvazquez left a comment

beorn7 left a comment

beorn7 Dec 11, 2024

beorn7 Dec 11, 2024

krajorama Dec 11, 2024

beorn7 Dec 11, 2024

krajorama Dec 11, 2024

beorn7 left a comment

Vendor update mimir-prometheus at af2a1cb10c89de496cd4309ac532624b34112d74 #10188

Vendor update mimir-prometheus at af2a1cb10c89de496cd4309ac532624b34112d74 #10188

Conversation

krajorama commented Dec 9, 2024 • edited Loading

What this PR does

Which issue(s) this PR fixes or relates to

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jesusvazquez commented Dec 10, 2024 • edited Loading

charleskorn left a comment

Choose a reason for hiding this comment

krajorama Dec 11, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

krajorama commented Dec 11, 2024

jhesketh left a comment

Choose a reason for hiding this comment

jesusvazquez left a comment

Choose a reason for hiding this comment

beorn7 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

beorn7 left a comment

Choose a reason for hiding this comment

krajorama commented Dec 9, 2024 •

edited

Loading

jesusvazquez commented Dec 10, 2024 •

edited

Loading

krajorama Dec 11, 2024 •

edited

Loading