[main] Update mimir-prometheus to acace3cd1e02 #12106
Conversation
|
I'm on it, had no time to take a look due to pages/incident. |
…rWithChunkSize The latter was removed from upstream prometheus. Signed-off-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
Signed-off-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
72c3dd8 to
b88e3b6
Compare
Preserve original first point histogram count before schema reset handling to fix calculateHistogramRate calculations. This fixes test failures when histograms have incompatible schemas . Signed-off-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
54631c9 to
7db1868
Compare
pkg/streamingpromql/engine_test.go
Outdated
| @@ -1969,6 +1969,7 @@ func runAnnotationTests(t *testing.T, testCases map[string]annotationTestCase) { | |||
| results := make([]*promql.Result, 0, 2) | |||
|
|
|||
| for engineName, engine := range engines { | |||
| fmt.Println("engineName", engineName) | |||
There was a problem hiding this comment.
It's already removed :)
Signed-off-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
| @@ -245,7 +258,6 @@ func calculateFloatRate(isCounter, isRate bool, rangeStart, rangeEnd int64, rang | |||
| averageDurationBetweenSamples := sampledInterval / float64(count-1) | |||
|
|
|||
| extrapolationThreshold := averageDurationBetweenSamples * 1.1 | |||
| extrapolateToInterval := sampledInterval | |||
There was a problem hiding this comment.
Changes in calculateFloatRate here just to keep this both funcs in sync with changes from prometheus/prometheus#16828
There was a problem hiding this comment.
do you know why these files keep changing? is this really the testing changes for 30 lines of code?
anyways, I'd defer to someone else about the changes here and in streamingpromql
There was a problem hiding this comment.
In this case, durations are comments added, and functions changes are consequence of the prometheus/prometheus#16828
There was a problem hiding this comment.
is this really the testing changes for 30 lines of code?
Sorry, didn't get it. You mean promql/testdata changes in upstream?
There was a problem hiding this comment.
durations.go only had documentation changes prometheus/prometheus#16863
functions.go had a change that affects just a few tests in native_histograms.text prometheus/prometheus#16828
The majority of the changes actually come from changes to the tests themselves: prometheus/prometheus#16585
Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Update mimir-prometheus dependency
This PR was automatically created by the update-vendored-mimir-prometheus.yml workflow.
Details:
main73cbc98c25ffacace3cd1e0232d0d167e1f8062accd0a318d06c73cbc98c25ff...acace3cd1e0232d0d167e1f8062accd0a318d06cNote to reviewer:
There are two manual changes to make it mergeable:
Use NewLeveledCompactorWithOptions instead of NewLeveledCompactorWithChunkSize – NewLeveledCompactorWithChunkSize was removed in upstream
Port "Prevent extrapolation below zero for histogram count" to MQE .
This one is more subtle. promql(histograms): scale a histogram the same as the count prometheus/prometheus#16828 was merged in upstream, affecting query results and causing some MQE tests to fail. The solution was to port the change to the MQE histogram rate implementation.