Add method label for prometheus middleware metrics (#3226)

Co-authored-by: 蓝益尤 <lan.yiyou@intellif.com>
master
SleeplessBot 2 years ago committed by GitHub
parent 9f42eda9ff
commit a93c24ce84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -136,7 +136,7 @@ func (ng *engine) buildChainWithNativeMiddlewares(fr featuredRoutes, route Route
chn = chn.Append(ng.getLogHandler()) chn = chn.Append(ng.getLogHandler())
} }
if ng.conf.Middlewares.Prometheus { if ng.conf.Middlewares.Prometheus {
chn = chn.Append(handler.PrometheusHandler(route.Path)) chn = chn.Append(handler.PrometheusHandler(route.Path, route.Method))
} }
if ng.conf.Middlewares.MaxConns { if ng.conf.Middlewares.MaxConns {
chn = chn.Append(handler.MaxConnsHandler(ng.conf.MaxConns)) chn = chn.Append(handler.MaxConnsHandler(ng.conf.MaxConns))

@ -18,7 +18,7 @@ var (
Subsystem: "requests", Subsystem: "requests",
Name: "duration_ms", Name: "duration_ms",
Help: "http server requests duration(ms).", Help: "http server requests duration(ms).",
Labels: []string{"path"}, Labels: []string{"path", "method"},
Buckets: []float64{5, 10, 25, 50, 100, 250, 500, 1000}, Buckets: []float64{5, 10, 25, 50, 100, 250, 500, 1000},
}) })
@ -27,19 +27,19 @@ var (
Subsystem: "requests", Subsystem: "requests",
Name: "code_total", Name: "code_total",
Help: "http server requests error count.", Help: "http server requests error count.",
Labels: []string{"path", "code"}, Labels: []string{"path", "code", "method"},
}) })
) )
// PrometheusHandler returns a middleware that reports stats to prometheus. // PrometheusHandler returns a middleware that reports stats to prometheus.
func PrometheusHandler(path string) func(http.Handler) http.Handler { func PrometheusHandler(path, method string) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler { return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
startTime := timex.Now() startTime := timex.Now()
cw := &response.WithCodeResponseWriter{Writer: w} cw := &response.WithCodeResponseWriter{Writer: w}
defer func() { defer func() {
metricServerReqDur.Observe(int64(timex.Since(startTime)/time.Millisecond), path) metricServerReqDur.Observe(int64(timex.Since(startTime)/time.Millisecond), path, method)
metricServerReqCodeTotal.Inc(path, strconv.Itoa(cw.Code)) metricServerReqCodeTotal.Inc(path, strconv.Itoa(cw.Code), method)
}() }()
next.ServeHTTP(cw, r) next.ServeHTTP(cw, r)

@ -10,7 +10,7 @@ import (
) )
func TestPromMetricHandler_Disabled(t *testing.T) { func TestPromMetricHandler_Disabled(t *testing.T) {
promMetricHandler := PrometheusHandler("/user/login") promMetricHandler := PrometheusHandler("/user/login", http.MethodGet)
handler := promMetricHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { handler := promMetricHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
})) }))
@ -26,7 +26,7 @@ func TestPromMetricHandler_Enabled(t *testing.T) {
Host: "localhost", Host: "localhost",
Path: "/", Path: "/",
}) })
promMetricHandler := PrometheusHandler("/user/login") promMetricHandler := PrometheusHandler("/user/login", http.MethodGet)
handler := promMetricHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { handler := promMetricHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
})) }))

Loading…
Cancel
Save