Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed promhttp Instrument* handlers. #1253

Merged
merged 2 commits into from May 3, 2023
Merged

Fixed promhttp Instrument* handlers. #1253

merged 2 commits into from May 3, 2023

Conversation

bwplotka
Copy link
Member

Unfortunately optionality is important as not every e.g. ObserverVec implements exemplar (e.g. summary).

For counters this is not that needed - but changed for consistency and readability.

@ns-rbarreda ns-rbarreda mentioned this pull request Apr 18, 2023
Merged
ns-rbarreda
ns-rbarreda approved these changes Apr 18, 2023
View reviewed changes
prometheus/promhttp/instrument_client.go Outdated Show resolved Hide resolved
beorn7
beorn7 approved these changes Apr 26, 2023
View reviewed changes
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.

Besides coding style nit.

And one more thought: Perhaps add do the doc comment of WithExemplarFromContext that using that option with a observer implementation that doesn't support exemplars will panic.

prometheus/promhttp/instrument_server.go Outdated Show resolved Hide resolved
@beorn7
Copy link
Member

beorn7 commented May 2, 2023

Could we expedite this and cut a 1.15.1 with it soon?

See prometheus/pushgateway#550 as an example for the fallout.

@beorn7 beorn7 mentioned this pull request May 2, 2023
Closed
@bwplotka
Copy link
Member Author

bwplotka commented May 2, 2023

Yup, will do, thanks for ping!

@bwplotka bwplotka changed the base branch from main to release-1.15 May 3, 2023 08:40
@bwplotka
Revert "Remove unnecessary check if label is nil in observeWithExempl…
2ea234e 
…ar (#1235)"

This reverts commit 3ce88f3.

Signed-off-by: bwplotka <bwplotka@gmail.com>
@bwplotka
Added clarification.
b8fdd23 
Signed-off-by: bwplotka <bwplotka@gmail.com>
@bwplotka
Copy link
Member Author

bwplotka commented May 3, 2023 •
edited

I decided to switch direction and revert 3ce88f3 commit & add quick commentary.

Might be better to avoid panics even in cost of confusion for people "why their exemplars don't work"

@bwplotka
Copy link
Member Author

bwplotka commented May 3, 2023

Sorry @dimonl for bad suggestion on this one 🙈

@bwplotka
Copy link
Member Author

bwplotka commented May 3, 2023

Merging, since it's a revert and tests are passing

@bwplotka bwplotka merged commit 2eaffbd into release-1.15 May 3, 2023
6 checks passed
@bwplotka bwplotka deleted the fixpro branch May 3, 2023 08:50
kakkoyun
kakkoyun reviewed May 3, 2023
View reviewed changes
Copy link
Member

@kakkoyun kakkoyun left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kakkoyun kakkoyun kakkoyun left review comments

@beorn7 beorn7 beorn7 approved these changes

@ns-rbarreda ns-rbarreda ns-rbarreda approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bwplotka @beorn7 @kakkoyun @ns-rbarreda