From bb79ed6f8edc1cb7fe556bf22b017766306b3c2f Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Wed, 10 Feb 2016 16:05:52 +0100 Subject: [PATCH] Small cleanup in metrics --- pkg/apiserver/metrics/metrics.go | 15 ++++++--------- pkg/apiserver/proxy.go | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkg/apiserver/metrics/metrics.go b/pkg/apiserver/metrics/metrics.go index ec7497c4baa..fb7736b0678 100644 --- a/pkg/apiserver/metrics/metrics.go +++ b/pkg/apiserver/metrics/metrics.go @@ -66,10 +66,11 @@ func Register() { prometheus.MustRegister(requestLatenciesSummary) } -func Monitor(verb, resource *string, client string, httpCode *int, reqStart time.Time) { - requestCounter.WithLabelValues(*verb, *resource, client, codeToString(*httpCode)).Inc() - requestLatencies.WithLabelValues(*verb, *resource).Observe(float64((time.Since(reqStart)) / time.Microsecond)) - requestLatenciesSummary.WithLabelValues(*verb, *resource).Observe(float64((time.Since(reqStart)) / time.Microsecond)) +func Monitor(verb, resource *string, client string, httpCode int, reqStart time.Time) { + elapsed := float64((time.Since(reqStart)) / time.Microsecond) + requestCounter.WithLabelValues(*verb, *resource, client, codeToString(httpCode)).Inc() + requestLatencies.WithLabelValues(*verb, *resource).Observe(elapsed) + requestLatenciesSummary.WithLabelValues(*verb, *resource).Observe(elapsed) } func Reset() { @@ -98,11 +99,7 @@ func InstrumentRouteFunc(verb, resource string, routeFunc restful.RouteFunction) response.ResponseWriter = rw routeFunc(request, response) - - elapsed := float64(time.Since(now)) / float64(time.Microsecond) - requestCounter.WithLabelValues(verb, resource, utilnet.GetHTTPClient(request.Request), codeToString(delegate.status)).Inc() - requestLatencies.WithLabelValues(verb, resource).Observe(elapsed) - requestLatenciesSummary.WithLabelValues(verb, resource).Observe(elapsed) + Monitor(&verb, &resource, utilnet.GetHTTPClient(request.Request), delegate.status, now) }) } diff --git a/pkg/apiserver/proxy.go b/pkg/apiserver/proxy.go index d640cb957f6..5c581032bec 100644 --- a/pkg/apiserver/proxy.go +++ b/pkg/apiserver/proxy.go @@ -57,7 +57,7 @@ func (r *ProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { var apiResource string var httpCode int reqStart := time.Now() - defer metrics.Monitor(&verb, &apiResource, net.GetHTTPClient(req), &httpCode, reqStart) + defer metrics.Monitor(&verb, &apiResource, net.GetHTTPClient(req), httpCode, reqStart) requestInfo, err := r.requestInfoResolver.GetRequestInfo(req) if err != nil || !requestInfo.IsResourceRequest {