Skip to content

Fix duplicate output vector if delayed name removal is disabled#15975

Merged
beorn7 merged 2 commits intoprometheus:mainfrom
jhesketh:jhesketh/duplicate-labelsets-label_join
Feb 5, 2025
Merged

Fix duplicate output vector if delayed name removal is disabled#15975
beorn7 merged 2 commits intoprometheus:mainfrom
jhesketh:jhesketh/duplicate-labelsets-label_join

Conversation

@jhesketh
Copy link
Contributor

@jhesketh jhesketh commented Feb 5, 2025

This error is emitted in cleanupMetricLabels, but is skipped if enableDelayedNameRemoval is false.

This makes it consistent with label_replace

This error is emitted in cleanupMetricLabels, but is skipped if
enableDelayedNameRemoval is false.

This makes it consistent with label_replace

Signed-off-by: Joshua Hesketh <josh@nitrotech.org>
Copy link
Member

@beorn7 beorn7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for spotting. So I guess this was buggy even before we introduced delayed name removal? /cc @jcreixell

TBS

Signed-off-by: Björn Rabenstein <github@rabenste.in>
@beorn7 beorn7 merged commit 5a5fdea into prometheus:main Feb 5, 2025
26 checks passed
charleskorn added a commit to grafana/mimir that referenced this pull request Mar 7, 2025
charleskorn added a commit to grafana/mimir that referenced this pull request Mar 11, 2025
charleskorn added a commit to grafana/mimir that referenced this pull request Mar 12, 2025
* Upgrade mimir-prometheus

* Bring in upstream test changes

* Apply change to match prometheus/prometheus#15974

* Remove test case added in upstream in prometheus/prometheus#15975

* Add tests for case where range vector selectors and subqueries have 0 range

Brings in change from #10586

* Update `sort` and `sort_desc` behaviour to match prometheus/prometheus#15964

* Add support for native histograms to `irate` and `idelta` to match prometheus/prometheus#15853

* Adjust test cases to match support for native histograms in `irate` and `idelta`

* Change binop annotations to match behaviour in prometheus/prometheus#15895

* Ignore incompatible schemas between the first and second point in `rate` and `increase` if the second point is a reset (prometheus/prometheus#15902)

* Adjust annotation test cases to match new behaviour introduced in previous commit

* Disable tests failing due to prometheus/prometheus#16199

* Add changelog entry

* Update `TestQuerySharding_FunctionCorrectness` to reflect changes in prometheus/prometheus#15964
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants