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

Jump to bottom

Fix incorrect authentication latency metric #99944

Merged
merged 1 commit into from Mar 16, 2021
Merged

Fix incorrect authentication latency metric #99944

merged 1 commit into from Mar 16, 2021

Conversation

marseel
Copy link
Member

@marseel marseel commented Mar 8, 2021 •
edited

What type of PR is this?

/kind bug

What this PR does / why we need it:

Authentication latency metric was incorrectly calculated. It took into account request duration.

Does this PR introduce a user-facing change?

Fixed authentication_duration_seconds metric. Previously it included whole apiserver request duration.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 8, 2021
@marseel
Copy link
Member Author

marseel commented Mar 8, 2021

/sig scalability
/cc @mborsz

@k8s-ci-robot k8s-ci-robot requested a review from mborsz March 8, 2021 14:01
@k8s-ci-robot k8s-ci-robot added the sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. label Mar 8, 2021
@marseel marseel force-pushed the fix/fix_incorrect_authenticator_metrics branch 2 times, most recently from 2b00fc7 to d0feb44 Compare March 8, 2021 14:55
@marseel
Copy link
Member Author

marseel commented Mar 8, 2021

/assign @wojtek-t

@wojtek-t
Copy link
Member

wojtek-t commented Mar 9, 2021

/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 Mar 9, 2021
@wojtek-t
Copy link
Member

wojtek-t commented Mar 9, 2021

/hold

@marseel - please add a release note
I would say that we should probably cherrypick this as the metrics were broken previously (@liggitt - for thoughts)

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Mar 9, 2021
@marseel
Copy link
Member Author

marseel commented Mar 9, 2021

I've added release note.
I think it makes sense to cherrypick it. Bug was introduced around ~1 year ago in #87631

@fedebongio
Copy link
Contributor

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Mar 9, 2021
liggitt
liggitt reviewed Mar 10, 2021
View reviewed changes
staging/src/k8s.io/apiserver/pkg/endpoints/filters/authentication.go Outdated
@@ -47,7 +47,7 @@ func WithAuthentication(handler http.Handler, auth authenticator.Request, failed
req = req.WithContext(authenticator.WithAudiences(req.Context(), apiAuds))
}
resp, ok, err := auth.AuthenticateRequest(req)
defer recordAuthMetrics(req.Context(), resp, ok, err, apiAuds, authenticationStart)
recordAuthMetrics(req.Context(), resp, ok, err, apiAuds, authenticationStart)
Copy link
Member

Choose a reason for hiding this comment

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

/hold

This breaks recording of the authentication audience error case on line 60. The fact that unit tests are green mean we have a test gap that should be closed as well.

Once this is correct, I would support merge and backport

Copy link
Member Author

Choose a reason for hiding this comment

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

I've added tests. Also, this error on line 60 was not working before. When you do defer f(err) err is evaluated at the time of defer, not later.

@marseel marseel force-pushed the fix/fix_incorrect_authenticator_metrics branch from d0feb44 to f8d5970 Compare March 15, 2021 17:32
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 15, 2021
@marseel marseel force-pushed the fix/fix_incorrect_authenticator_metrics branch from f8d5970 to 9b87464 Compare March 15, 2021 17:34
@marseel marseel force-pushed the fix/fix_incorrect_authenticator_metrics branch from 9b87464 to 7dffc11 Compare March 15, 2021 17:40
@liggitt
Copy link
Member

liggitt commented Mar 15, 2021

/lgtm
/approve
/hold cancel
/priority important-soon
/milestone v1.21
/kind regression

fixes regression in 1.18+ that breaks the ability to determine how long the authentication phase of the request is taking

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. kind/regression Categorizes issue or PR as related to a regression from a prior release. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Mar 15, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 15, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Mar 15, 2021
@liggitt
Copy link
Member

liggitt commented Mar 15, 2021

/retest

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, marseel, wojtek-t

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 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 15, 2021
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 067ab92 into kubernetes:master Mar 16, 2021
@ialidzhikov
Copy link
Contributor

@marseel , can you file the corresponding cherry-pick PRs?
Ref https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md

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

@liggitt liggitt liggitt left review comments

@mborsz mborsz mborsz left review comments

@deads2k deads2k Awaiting requested review from deads2k

@soltysh soltysh Awaiting requested review from soltysh

Assignees

@liggitt liggitt

@wojtek-t wojtek-t

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/regression Categorizes issue or PR as related to a regression from a prior release. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@marseel @wojtek-t @fedebongio @liggitt @k8s-ci-robot @fejta-bot @ialidzhikov @mborsz