Skip to content

Merge remote-tracking branch 'origin/main' into feature/start-time#18071

Merged
bwplotka merged 15 commits into
feature/start-timefrom
owilliams/merge-from-main
Feb 13, 2026
Merged

Merge remote-tracking branch 'origin/main' into feature/start-time#18071
bwplotka merged 15 commits into
feature/start-timefrom
owilliams/merge-from-main

Conversation

@ywwg

@ywwg ywwg commented Feb 12, 2026

Copy link
Copy Markdown
Member

No description provided.

zenador and others added 15 commits February 11, 2026 05:06
Add regression test for the bug where avg_over_time with a single
histogram sample would produce +Inf count/sum and NaN zero bucket
due to division by zero. The test verifies that both regular
exponential histograms and native histograms with custom buckets
(NHCB) correctly return the histogram unchanged when averaging
a single sample.

Signed-off-by: Jeanette Tan <[email protected]>
avg_over_time would produce +Inf count/sum and NaN zero bucket when
averaging a single histogram, because the count variable was initialized
to 0 instead of 1. This caused a division by zero at the end of the
function.

The float version of avg_over_time already correctly initializes count
to 1, this change makes the histogram version consistent with that.

Signed-off-by: Jeanette Tan <[email protected]>
…al flags

Parser configuration is now per-engine/API/loader and no longer uses package-level flags, so behavior is consistent and tests don't rely on save/restore of global variables.

Signed-off-by: Martin Valiente Ainz <[email protected]>
…tion

PromQL: Refactor parser to use instance configuration instead of global flags
promql: fix avg_over_time for single native histogram
Fail Go mod check if the `go` directive in `go.mod` is newer than
the currently supported Go versions.

Signed-off-by: SuperQ <[email protected]>
chore: Check that previous go version check actually uses previous go version
With native histograms being a stable feature, we should get rid of
this special line, which isn't really mapping maintainership to a
subtree, but to something that is all over the codebase.

Additionally, @beorn7 will soon retire from the project, so we needed
to remove him from this file anyway.

Signed-off-by: beorn7 <[email protected]>
Remove special native histogram line from MAINTAINERS.md
@ywwg
ywwg marked this pull request as ready for review February 12, 2026 18:19
@ywwg
ywwg requested review from a team, dgl and roidelapluie as code owners February 12, 2026 18:19
@ywwg

ywwg commented Feb 12, 2026

Copy link
Copy Markdown
Member Author

feels like flaky tests to me

@krajorama krajorama left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

stamp

@bwplotka

Copy link
Copy Markdown
Member

Hm I think it's our changes that trigger one of those in general (not this PR though specifically)

  • guess: Ref2 is a bit chunkier so OOM on testdata creation:
	/usr/local/go/src/runtime/slice.go:264 +0x4d3 fp=0xbc91de0 sp=0xbc91da0 pc=0x80d2c43
github.com/prometheus/prometheus/storage/remote.createTimeseries(0xfa0, 0xfa0, {0x0, 0x0, 0x0})
	/__w/prometheus/prometheus/storage/remote/queue_manager_test.go:848 +0x50c fp=0xbc91eb4 sp=0xbc91de0 pc=0x8e0eaac

@bwplotka
bwplotka merged commit d9fbe7b into feature/start-time Feb 13, 2026
25 of 27 checks passed
@bwplotka
bwplotka deleted the owilliams/merge-from-main branch February 13, 2026 05:41
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.

8 participants