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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃悰 remove deprecated workqueue metrics with invalid names #437

Merged
merged 1 commit into from
Jun 7, 2019
Merged

馃悰 remove deprecated workqueue metrics with invalid names #437

merged 1 commit into from
Jun 7, 2019

Conversation

abursavich
Copy link
Contributor

@abursavich abursavich commented May 19, 2019

Migration work was already done to move controller-runtime from k8s v1.13 to v1.14, however this introduced certain issues.

Unfortunately, workqueue_queue_duration_seconds and workqueue_work_duration_seconds were included in v0.1.10, but were recorded with microsecond values. Moving to k8s v1.14 corrects those values to seconds.

Primarily this change removes the metrics that were deprecated in k8s v1.14, but were never previously included in v0.1 of controller-runtime and thereby fixes #436.

The one metric that was deprecated and retained is longest_running_processor_microseconds, as it was included in v0.1.10.

@k8s-ci-robot
Copy link
Contributor

Welcome @abursavich!

It looks like this is your first PR to kubernetes-sigs/controller-runtime 馃帀. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/controller-runtime has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 馃槂

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 19, 2019
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. labels May 19, 2019
@abursavich abursavich changed the title metrics: migrate workqueue provider to v1.14 removing deprecated metrics 馃悰 remove deprecated workqueue metrics with invalid names May 19, 2019
@abursavich abursavich changed the title 馃悰 remove deprecated workqueue metrics with invalid names bug remove deprecated workqueue metrics with invalid names May 19, 2019
@abursavich abursavich changed the title bug remove deprecated workqueue metrics with invalid names 馃悰 remove deprecated workqueue metrics with invalid names May 19, 2019
@abursavich abursavich changed the title 馃悰 remove deprecated workqueue metrics with invalid names 馃悰 remove deprecated workqueue metrics with invalid names May 19, 2019
Copy link
Contributor

@DirectXMan12 DirectXMan12 left a comment

Choose a reason for hiding this comment

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

minor nit around error messages, otherwise lgtm. Thanks!

ConstLabels: prometheus.Labels{"name": name},
})
if err := Registry.Register(depth); err != nil {
log.Error(err, "failed to register "+metricName+" metric", "name", name)
Copy link
Contributor

Choose a reason for hiding this comment

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

error messages should never be variable -- that's what the key-value pairs are for

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i'm happy to change them if you'd like, but the messages are actually constant expressions (metricName is a local constant in each of the methods)

@abursavich
Copy link
Contributor Author

Thanks for the review, @DirectXMan12. PTAL.

@DirectXMan12
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 5, 2019
@abursavich
Copy link
Contributor Author

The test failure was fixed with #466 ... I'll push again to retrigger Travis.

@abursavich
Copy link
Contributor Author

abursavich commented Jun 7, 2019

After rebasing and picking up 17e0976, Github really doesn't want me to push https://github.com/kubernetes-sigs/controller-runtime/blob/master/.github/main.workflow to my repo.

! [remote rejected] queuemetrics -> queuemetrics (refusing to allow an integration to create main.workflow)

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 7, 2019
@abursavich
Copy link
Contributor Author

I cherrypicked the race fix without the Github Action change, but, uhhh... I don't know how to get around this Github issue. If this PR goes through, I might try deleting my repo and re-forking post-Action commit.

@DirectXMan12
Copy link
Contributor

That's a bizarre message. Are you not using a normal git client? Keep me updated on that issue -- if it's causing you issues, it might cause others issues, so we may need to figure out a way around it or back it out.

Migration work was already done to move controller-runtime from k8s v1.13 to v1.14, however this introduced certain issues.

Unfortunately, workqueue_queue_duration_seconds and workqueue_work_duration_seconds were included in v0.1.10, but were recorded with microsecond values. Moving to k8s v1.14 corrects those values to seconds.

Primarily this change removes the metrics that were deprecated in k8s v1.14, but were never previously included in v0.1 of controller-runtime.

The one metric that was deprecated and is retained is longest_running_processor_microseconds, as it was included in v0.1.10.
@DirectXMan12
Copy link
Contributor

It let me push it. I've rebased up to master, so this should work now. Will merge once tests pass.

@DirectXMan12
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 7, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abursavich, DirectXMan12

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit d708e3d into kubernetes-sigs:master Jun 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Queue metrics broken when using the controller builder
3 participants