aboutsummaryrefslogtreecommitdiffhomepage
path: root/metrics.go
diff options
context:
space:
mode:
authorDave Henderson <[email protected]>2022-01-24 08:35:51 -0500
committerDave Henderson <[email protected]>2022-01-25 15:07:17 -0500
commit7ca5921a87c819f9848ccd7ec786aab0f896be72 (patch)
treea8dbe6a5bbb0aa10dc9ab9c2f5111e017e559358 /metrics.go
parentda4a759bad70cae9f4f1f38a03c26f75aa04352f (diff)
downloadcaddy-7ca5921a87c819f9848ccd7ec786aab0f896be72.tar.gz
caddy-7ca5921a87c819f9848ccd7ec786aab0f896be72.zip
move common metrics-related funcs to internal package
Signed-off-by: Dave Henderson <[email protected]>
Diffstat (limited to 'metrics.go')
-rw-r--r--metrics.go39
1 files changed, 3 insertions, 36 deletions
diff --git a/metrics.go b/metrics.go
index 8a502601b..325006fbf 100644
--- a/metrics.go
+++ b/metrics.go
@@ -2,8 +2,8 @@ package caddy
import (
"net/http"
- "strconv"
+ "github.com/caddyserver/caddy/v2/internal/metrics"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors"
"github.com/prometheus/client_golang/prometheus/promauto"
@@ -45,8 +45,8 @@ func instrumentHandlerCounter(counter *prometheus.CounterVec, next http.Handler)
d := newDelegator(w)
next.ServeHTTP(d, r)
counter.With(prometheus.Labels{
- "code": sanitizeCode(d.status),
- "method": sanitizeMethod(r.Method),
+ "code": metrics.SanitizeCode(d.status),
+ "method": metrics.SanitizeMethod(r.Method),
}).Inc()
})
}
@@ -66,36 +66,3 @@ func (d *delegator) WriteHeader(code int) {
d.status = code
d.ResponseWriter.WriteHeader(code)
}
-
-func sanitizeCode(s int) string {
- switch s {
- case 0, 200:
- return "200"
- default:
- return strconv.Itoa(s)
- }
-}
-
-// Only support the list of "regular" HTTP methods, see
-// https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
-var methodMap = map[string]string{
- "GET": http.MethodGet, "get": http.MethodGet,
- "HEAD": http.MethodHead, "head": http.MethodHead,
- "PUT": http.MethodPut, "put": http.MethodPut,
- "POST": http.MethodPost, "post": http.MethodPost,
- "DELETE": http.MethodDelete, "delete": http.MethodDelete,
- "CONNECT": http.MethodConnect, "connect": http.MethodConnect,
- "OPTIONS": http.MethodOptions, "options": http.MethodOptions,
- "TRACE": http.MethodTrace, "trace": http.MethodTrace,
- "PATCH": http.MethodPatch, "patch": http.MethodPatch,
-}
-
-// sanitizeMethod sanitizes the method for use as a metric label. This helps
-// prevent high cardinality on the method label. The name is always upper case.
-func sanitizeMethod(m string) string {
- if m, ok := methodMap[m]; ok {
- return m
- }
-
- return "OTHER"
-}