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.

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

Re-add the defer statements around the monitor() calls in the apiserver. #5147

Merged
merged 1 commit into from
Mar 6, 2015

Conversation

a-robinson
Copy link
Contributor

These are needed for the changes to various labels from later in the function are picked up. They were incorrectly removed in #4507, causing the fields to always be empty in all exported metrics.

If you would prefer a different way of enabling this behavior I'd be happy to change to it, but we can't remove the closures without inserting some other logic to replace them.

@lavalamp
Copy link
Member

lavalamp commented Mar 6, 2015

Ah, that's why it was like that. Sorry about that. What do you think about making the monitor function take pointers instead of requiring everything to be in closures?

…pointers.

This is needed for the changes to various labels from later in the function
to be picked up.
@a-robinson
Copy link
Contributor Author

Fine by me! Done.

@lavalamp
Copy link
Member

lavalamp commented Mar 6, 2015

LGTM, will merge on green

lavalamp added a commit that referenced this pull request Mar 6, 2015
Re-add the defer statements around the monitor() calls in the apiserver.
@lavalamp lavalamp merged commit 05ea93f into kubernetes:master Mar 6, 2015
@a-robinson a-robinson deleted the func branch March 7, 2015 00:15
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.

3 participants