mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #37477 from bruceauyeung/k8s-branch-fix-metrics-monitor-always-get-zero-value-http-code-in-ServeHTTP
Automatic merge from submit-queue fix incorrect parameter pass to metrics.Monitor method call in ServeHTTP **What this PR does / why we need it**: before this PR: 1. `httpCode` is evaluated when defer statement executes, so all later assignments to `httpCode` is actually ineffectual. this obviously is not the design purpose. 2. `w.Header().Get("Content-Type")` is evaluated when defer statement executes, so all later `w.Header().Set("Content-Type",xxx)` ( in `writeNegotiated` ) is ineffectual to `metrics.Monitor`, i think this also is not the design purpose. after this PR: 1. `httpCode` and `w.Header().Get("Content-Type")` is evaluated when the defered anonymous function executes, so `metrics.Monitor` will get correct `httpCode` and `Content-Type` field value. 2. in `ServeHTTP` method there is not any modification to `req` parameter, so it's safe to defer its evaluation. Signed-off-by: bruceauyeung <ouyang.qinhua@zte.com.cn>
This commit is contained in:
commit
2bd077df6d
@ -59,7 +59,12 @@ func (r *ProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
|
|||||||
var apiResource string
|
var apiResource string
|
||||||
var httpCode int
|
var httpCode int
|
||||||
reqStart := time.Now()
|
reqStart := time.Now()
|
||||||
defer metrics.Monitor(&verb, &apiResource, net.GetHTTPClient(req), w.Header().Get("Content-Type"), httpCode, reqStart)
|
defer func() {
|
||||||
|
metrics.Monitor(&verb, &apiResource,
|
||||||
|
net.GetHTTPClient(req),
|
||||||
|
w.Header().Get("Content-Type"),
|
||||||
|
httpCode, reqStart)
|
||||||
|
}()
|
||||||
|
|
||||||
ctx, ok := r.Mapper.Get(req)
|
ctx, ok := r.Mapper.Get(req)
|
||||||
if !ok {
|
if !ok {
|
||||||
|
Loading…
Reference in New Issue
Block a user