promql: fix incorrect results and panics in sum and avg over mixed custom and exponential buckets, or incompatible custom buckets
#14611
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ncompatible custom buckets, produces incorrect results Signed-off-by: Charles Korn <charles.korn@grafana.com>
…ncompatible custom buckets, produces incorrect results or panics Signed-off-by: Charles Korn <charles.korn@grafana.com>
Signed-off-by: Charles Korn <charles.korn@grafana.com>
Merged
2 tasks
|
Thank you. Related to #13494 |
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
Aug 8, 2024
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
Aug 8, 2024
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
Aug 8, 2024
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
Aug 8, 2024
…tions (#8924) * Enable histogram test cases. * Enable test cases we now support * Emit warnings from `rate` and `sum` if a custom and exponential buckets are seen at the same timestamp, or if incompatible custom buckets are seen at the same timestamp * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move custom bucket check earlier in `rate` * Address PR feedback: clarify comments * Address PR feedback: extend test case range to include samples after an ignored sample * Skip `TestAnnotations` test case that fails on Prometheus' engine due to prometheus/prometheus#14609 * Skip test cases that fail on Prometheus' engine due to prometheus/prometheus#14611 * Fix failing test
beorn7
requested changes
Aug 8, 2024
Signed-off-by: Charles Korn <charles.korn@grafana.com>
Signed-off-by: Charles Korn <charles.korn@grafana.com>
…stograms Signed-off-by: Charles Korn <charleskorn@users.noreply.github.com>
|
@charleskorn could you resolve the merge conflicts once more? I'll try to merge ASAP after that. |
…stograms # Conflicts: # promql/promqltest/testdata/native_histograms.test
Yep, done. |
beorn7
approved these changes
Aug 14, 2024
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
Sep 2, 2024
krajorama
added a commit
to grafana/mimir
that referenced
this pull request
Sep 2, 2024
#9156) * Update mimir-prometheus Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * DefaultChunkedReadLimit was moved from storage to config Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Adopt to new remote read client interface Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Update otlp generate code Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * OTLP: ignore annotations for now Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Remote read Content-Type unset in tests Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Use client_golang 1.19.1 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Update engine test cases from upstream Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Mark unsupported engine expressions Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Disable test that assumes the newly added `promql-delayed-name-removal` flag is enabled * Re-enable running MQE test cases against Prometheus' engine now that prometheus/prometheus#14611 has been merged * Updates due to review Add changelog. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Charles Korn <charles.korn@grafana.com>
grafanabot
pushed a commit
to grafana/mimir
that referenced
this pull request
Sep 2, 2024
#9156) * Update mimir-prometheus Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * DefaultChunkedReadLimit was moved from storage to config Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Adopt to new remote read client interface Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Update otlp generate code Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * OTLP: ignore annotations for now Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Remote read Content-Type unset in tests Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Use client_golang 1.19.1 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Update engine test cases from upstream Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Mark unsupported engine expressions Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Disable test that assumes the newly added `promql-delayed-name-removal` flag is enabled * Re-enable running MQE test cases against Prometheus' engine now that prometheus/prometheus#14611 has been merged * Updates due to review Add changelog. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Charles Korn <charles.korn@grafana.com> (cherry picked from commit 61634ee)
krajorama
added a commit
to grafana/mimir
that referenced
this pull request
Sep 2, 2024
#9156) (#9176) * Update mimir-prometheus Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * DefaultChunkedReadLimit was moved from storage to config Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Adopt to new remote read client interface Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Update otlp generate code Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * OTLP: ignore annotations for now Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Remote read Content-Type unset in tests Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Use client_golang 1.19.1 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Update engine test cases from upstream Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Mark unsupported engine expressions Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * Disable test that assumes the newly added `promql-delayed-name-removal` flag is enabled * Re-enable running MQE test cases against Prometheus' engine now that prometheus/prometheus#14611 has been merged * Updates due to review Add changelog. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Charles Korn <charles.korn@grafana.com> (cherry picked from commit 61634ee) Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sumandavgcould return incorrect results, or, in the case ofavg, panic, if mixed custom and exponential buckets were encountered at a single timestamp, or if incompatible custom buckets were encountered at a single timestamp.