WIP: V2 metrics middleware

pkg/api/middleware/metrics.go

@@ -6,6 +6,34 @@ import (
 	"net/http"
 )
 
+func MetricsV2(rec metrics.Recorder, routeTemplate string) mux.MiddlewareFunc {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+
+			// Don't want metric requests messing with our actual metrics
+			if r.URL.Path == "/metrics" {
+				next.ServeHTTP(w, r)
+				return
+			}
+
+			// wrap original http.ResponseWriter
+			rwd := responseWriterDecorator{
+				ResponseWriter: w,
+				StatusCode:     0,
+			}
+
+			// Record request duration with the path
+			rec.ReportRequestDuration(routeTemplate, func() {
+				next.ServeHTTP(&rwd, r)
+			})
+
+			if isServerErrorCode(rwd.StatusCode) {
+				go rec.CountServerError()
+			}
+		})
+	}
+}
+
 func Metrics(rec metrics.Recorder) mux.MiddlewareFunc {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {