github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-28 22:55:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

metrics: Always track method label in uppercase (#3742)

Browse Source 
* metrics: Always track method label in uppercase

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

* Just use strings.ToUpper for clarity

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
This commit is contained in:
Dave Henderson
2020-09-22 22:10:34 -04:00
committed by GitHub
parent be6daa5fd4
commit f197cec7f3
3 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/caddyhttp/metrics.go
View File

@ -4,6 +4,7 @@ import (
"context"
"net/http"
"strconv"
"strings"
"sync"
"time"
@ -108,7 +109,10 @@ func newMetricsInstrumentedHandler(handler string, mh MiddlewareHandler) *metric
func (h *metricsInstrumentedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request, next Handler) error {
server := serverNameFromContext(r.Context())
labels := prometheus.Labels{"server": server, "handler": h.handler}
statusLabels := prometheus.Labels{"server": server, "handler": h.handler, "method": r.Method, "code": ""}
method := strings.ToUpper(r.Method)
// the "code" value is set later, but initialized here to eliminate the possibility
// of a panic
statusLabels := prometheus.Labels{"server": server, "handler": h.handler, "method": method, "code": ""}
inFlight := httpMetrics.requestInFlight.With(labels)
inFlight.Inc()
@ -154,7 +158,6 @@ func sanitizeCode(code int) string {
return "200"
}
return strconv.Itoa(code)
}
// taken from https://github.com/prometheus/client_golang/blob/6007b2b5cae01203111de55f753e76d8dac1f529/prometheus/promhttp/instrument_server.go#L298