Skip to content

Return info annotations in addition to warnings in the API - #1963

Merged
bwplotka merged 3 commits into
prometheus:mainfrom
zenador:return-info-annos
Jul 24, 2026
Merged

bwplotka merged 3 commits into
prometheus:mainfrom
zenador:return-info-annos

Conversation

@zenador

@zenador zenador commented Mar 16, 2026

Copy link
Copy Markdown
Contributor

Now that Prometheus API returns infos as well as warnings, see here, we should add that here as well. This is the non-breaking change version, please let me know if you'd prefer to change the API here as well to have infos as a separate field.

Comment thread api/prometheus/v1/api.go

@kakkoyun kakkoyun 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.

Thanks for the PR.

I think we need to make some design decisions for the API here.

Comment thread api/prometheus/v1/api.go

@bwplotka bwplotka 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.

Hi! Sorry for lags!

Do you mind rebasing?

I don't disagree with @kakkoyun but I would be happy with 4 params too

@zenador

zenador commented Jul 10, 2026

Copy link
Copy Markdown
Contributor Author

Hi np! I'm happy to change it if that's the better option, so let me know which is preferred and I'll update it if necessary and rebase!

zenador added 3 commits July 24, 2026 02:42
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
…tations like Prometheus does

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
@zenador
zenador force-pushed the return-info-annos branch from 3ee6518 to 687d9f1 Compare July 23, 2026 18:42

@bwplotka bwplotka 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.

Thanks!

@bwplotka
bwplotka merged commit ecdb825 into prometheus:main Jul 24, 2026
15 checks passed
zenador added a commit to grafana/mimir that referenced this pull request Aug 18, 2026
#### What this PR does

Adds an integration test to check that results with and without query
sharding (within MQE with remote execution) are the same (along with the
annotations).

Vendors changes from
prometheus/client_golang#1963, ~~but this is
blocked now that main vendors a newer dskit which vendors a newer
release of client_golang that doesn't include this change.~~

#### Which issue(s) this PR fixes or relates to

N/A

#### Checklist

- [x] Tests updated.
- [ ] Documentation added.
- [x] `CHANGELOG.md` updated - the order of entries should be
`[CHANGE]`, `[FEATURE]`, `[ENHANCEMENT]`, `[BUGFIX]`. If changelog entry
is not needed, please add the `changelog-not-needed` label to the PR.
- [ ]
[`about-versioning.md`](https://github.com/grafana/mimir/blob/main/docs/sources/mimir/configure/about-versioning.md)
updated with experimental features.

No changelog as it's not user-facing
@kakkoyun kakkoyun mentioned this pull request Oct 5, 2026
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.

4 participants