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.

Sign up for GitHub

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

Small cleanup in metrics #20974

Merged
merged 1 commit into from
Feb 15, 2016
Merged

Small cleanup in metrics #20974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 6 additions & 9 deletions pkg/apiserver/metrics/metrics.go
View file
Open in desktop
Expand Up @@ -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() {
Expand Down Expand Up @@ -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)
})
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/proxy.go
View file
Open in desktop
Expand Up @@ -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 {
Expand Down