Merge pull request #65634 from wojtek-t/fix_code_content_type

Automatic merge from submit-queue (batch tested with PRs 65319, 64513, 65474, 65601, 65634). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix apiserver metrics

Merge pull request #65634 from wojtek-t/fix_code_content_type
4f465fac · Kubernetes Submit Queue · GitHub · 21b960a1 · 3d9552cc · 4f465fac
Unverified Commit 4f465fac authored Jun 29, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

metrics.go ...ing/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go +2 -2

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
@@ -163,9 +163,9 @@ func Record(req *http.Request, requestInfo *request.RequestInfo, contentType str
 	}
 	scope := CleanScope(requestInfo)
 	if requestInfo.IsResourceRequest {
-		MonitorRequest(req, strings.ToUpper(requestInfo.Verb), requestInfo.Resource, requestInfo.Subresource, contentType, scope, code, responseSizeInBytes, elapsed)
+		MonitorRequest(req, strings.ToUpper(requestInfo.Verb), requestInfo.Resource, requestInfo.Subresource, scope, contentType, code, responseSizeInBytes, elapsed)
 	} else {
-		MonitorRequest(req, strings.ToUpper(requestInfo.Verb), "", requestInfo.Path, contentType, scope, code, responseSizeInBytes, elapsed)
+		MonitorRequest(req, strings.ToUpper(requestInfo.Verb), "", requestInfo.Path, scope, contentType, code, responseSizeInBytes, elapsed)
 	}
 }