Merge pull request #747 from onflow/mpeter/refactor-request-duration-metric

Refactor metric for request duration

Author: m-Peter

api/server.go

@@ -248,13 +248,15 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	requestBody := make(map[string]any)
+	requestMethod := ""
 	if b, err := io.ReadAll(r.Body); err == nil {
 		_ = json.Unmarshal(b, &requestBody)
 
 		// Do not log any debug info for methods that are not valid
 		// JSON-RPC methods.
 		if methodValue, ok := requestBody["method"]; ok {
 			if methodStr, ok := methodValue.(string); ok && eth.IsValidMethod(methodStr) {
+				requestMethod = methodStr
 				h.logger.Debug().
 					Str("IP", r.RemoteAddr).
 					Str("url", r.URL.String()).
@@ -284,13 +286,16 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if h.httpHandler != nil {
-		if checkPath(r, "") {
-			metrics.
-				NewMetricsHandler(h.httpHandler, h.collector, h.logger).
-				ServeHTTP(logW, r)
-			return
+	if h.httpHandler != nil && checkPath(r, "") {
+		start := time.Now()
+
+		h.httpHandler.ServeHTTP(logW, r)
+
+		if eth.IsValidMethod(requestMethod) {
+			h.collector.MeasureRequestDuration(start, requestMethod)
 		}
+
+		return
 	}
 
 	w.WriteHeader(http.StatusNotFound)