Make logged verbs match metric-reported verbs #102934
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
release-note
k8s-ci-robot
added
approved
|
/test pull-kubernetes-unit |
wojtek-t
reviewed
Jun 17, 2021
| // we can convert GETs to LISTs when needed. | ||
| scope := metrics.CleanScope(requestInfo) | ||
| verb = metrics.CanonicalVerb(strings.ToUpper(verb), scope) | ||
| // FIX BEFORE MERGING: this if clause doesn't get hit. Fix or delete. |
There was a problem hiding this comment.
Yeah, the filter chain ordering was wrong.
|
/triage accepted |
k8s-ci-robot
added
triage/accepted
lavalamp
commented
Jun 17, 2021
| @@ -774,6 +773,7 @@ func DefaultBuildHandlerChain(apiHandler http.Handler, c *Config) http.Handler { | |||
| handler = genericapifilters.WithCacheControl(handler) | |||
| handler = genericfilters.WithHSTS(handler, c.HSTSDirectives) | |||
| handler = genericfilters.WithHTTPLogging(handler) | |||
| handler = genericapifilters.WithRequestInfo(handler, c.RequestInfoResolver) | |||
There was a problem hiding this comment.
For the curious, this reordering doesn't cause apiserver to do more net work unless the probabilistic GOAWAY triggers, which is going to be rare or extremely rare.
|
This works now. Since you already looked at it: cc @logicalhan fyi |
wojtek-t
reviewed
Jun 18, 2021
| @@ -774,6 +773,7 @@ func DefaultBuildHandlerChain(apiHandler http.Handler, c *Config) http.Handler { | |||
| handler = genericapifilters.WithCacheControl(handler) | |||
| handler = genericfilters.WithHSTS(handler, c.HSTSDirectives) | |||
| handler = genericfilters.WithHTTPLogging(handler) | |||
| handler = genericapifilters.WithRequestInfo(handler, c.RequestInfoResolver) | |||
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: lavalamp, 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 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
/kind bug
What this PR does / why we need it:
Make the verbs printed in the logs match the verbs in the metrics. (That is, show LIST, WATCH, APPLY virtual verbs correctly)
/sig api-machinery