Fix cache metrics path (#89)

* Fix cache metrics path

* test

Author: lucaslopezf

pkg/zrouter/zmiddlewares/cache.go

@@ -71,14 +71,14 @@ func tryServeFromCache(w http.ResponseWriter, r *http.Request, cache zcache.ZCac
 		w.Header().Set(domain.ContentTypeHeader, domain.ContentTypeApplicationJSON)
 		_, _ = w.Write(cachedResponse)
 
-		if err = metricServer.IncrementMetric(cacheHitsMetric, r.URL.Path); err != nil {
+		if err = metricServer.IncrementMetric(cacheHitsMetric, GetRoutePattern(r)); err != nil {
 			logger.GetLoggerFromContext(r.Context()).Errorf("Error incrementing cache_hits metric: %v", err)
 		}
 
 		return true
 	}
 
-	if err = metricServer.IncrementMetric(cacheMissesMetric, r.URL.Path); err != nil {
+	if err = metricServer.IncrementMetric(cacheMissesMetric, GetRoutePattern(r)); err != nil {
 		logger.GetLoggerFromContext(r.Context()).Errorf("Error incrementing cache_misses metric: %v", err)
 	}
 
@@ -96,7 +96,7 @@ func cacheResponseIfNeeded(rw *responseWriter, r *http.Request, cache zcache.ZCa
 		return
 	}
 
-	if err := metricServer.IncrementMetric(cacheSetsMetric, r.URL.Path); err != nil {
+	if err := metricServer.IncrementMetric(cacheSetsMetric, GetRoutePattern(r)); err != nil {
 		logger.GetLoggerFromContext(r.Context()).Errorf("Error incrementing cache_sets metric: %v", err)
 	}
 }

pkg/zrouter/zmiddlewares/common.go

@@ -1,6 +1,8 @@
 package zmiddlewares
 
 import (
+	"github.com/go-chi/chi/v5"
+	"net/http"
 	"regexp"
 	"strings"
 )
@@ -13,3 +15,7 @@ func PathToRegexp(path string) *regexp.Regexp {
 	pattern := regexp.MustCompile(`\{[^}]*\}`).ReplaceAllString(escapedPath, "[^/]+")
 	return regexp.MustCompile("^" + pattern + "$")
 }
+
+func GetRoutePattern(r *http.Request) string {
+	return chi.RouteContext(r.Context()).RoutePattern()
+}

pkg/zrouter/zmiddlewares/common_test.go

@@ -0,0 +1,27 @@
+package zmiddlewares
+
+import (
+	"github.com/go-chi/chi/v5"
+	"github.com/stretchr/testify/assert"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestGetRoutePattern(t *testing.T) {
+	r := chi.NewRouter()
+
+	routePattern := "/test/{param}"
+	r.Get(routePattern, func(w http.ResponseWriter, r *http.Request) {
+		routePattern := GetRoutePattern(r)
+
+		assert.Equal(t, routePattern, "/test/{param}", "The returned route pattern should match the one configured in the router.")
+	})
+
+	req := httptest.NewRequest("GET", "/test/123", nil)
+	w := httptest.NewRecorder()
+
+	r.ServeHTTP(w, req)
+
+	assert.Equal(t, http.StatusOK, w.Code, "The expected status code should be 200 OK.")
+}

pkg/zrouter/zmiddlewares/metrics.go

@@ -1,7 +1,6 @@
 package zmiddlewares
 
 import (
-	"github.com/go-chi/chi/v5"
 	"github.com/zondax/golem/pkg/logger"
 	"github.com/zondax/golem/pkg/metrics"
 	"github.com/zondax/golem/pkg/metrics/collectors"
@@ -51,7 +50,7 @@ func RequestMetrics(metricsServer metrics.TaskMetrics) Middleware {
 
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			path := chi.RouteContext(r.Context()).RoutePattern()
+			path := GetRoutePattern(r)
 			startTime := time.Now()
 
 			mu.Lock()