feat(fxcore): Updated core http server metrics configurations

fxcore/module.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"strings"
 
 	"github.com/labstack/echo/v4"
 
@@ -209,7 +208,7 @@ func withMiddlewares(coreServer *echo.Echo, p FxCoreParam) *echo.Echo {
 
 		var buckets []float64
 		if bucketsConfig := p.Config.GetString("modules.core.server.metrics.buckets"); bucketsConfig != "" {
-			for _, s := range strings.Split(strings.ReplaceAll(bucketsConfig, " ", ""), ",") {
+			for _, s := range Split(bucketsConfig) {
 				f, err := strconv.ParseFloat(s, 64)
 				if err == nil {
 					buckets = append(buckets, f)
@@ -219,8 +218,8 @@ func withMiddlewares(coreServer *echo.Echo, p FxCoreParam) *echo.Echo {
 
 		metricsMiddlewareConfig := httpservermiddleware.RequestMetricsMiddlewareConfig{
 			Registry:                p.MetricsRegistry,
-			Namespace:               strings.ReplaceAll(namespace, "-", "_"),
-			Subsystem:               strings.ReplaceAll(subsystem, "-", "_"),
+			Namespace:               Sanitize(namespace),
+			Subsystem:               Sanitize(subsystem),
 			Buckets:                 buckets,
 			NormalizeRequestPath:    p.Config.GetBool("modules.core.server.metrics.normalize.request_path"),
 			NormalizeResponseStatus: p.Config.GetBool("modules.core.server.metrics.normalize.response_status"),

fxcore/util.go

@@ -0,0 +1,16 @@
+package fxcore
+
+import "strings"
+
+// Sanitize transforms a given string to not contain spaces or dashes, and to be in lower case.
+func Sanitize(str string) string {
+	san := strings.ReplaceAll(str, " ", "_")
+	san = strings.ReplaceAll(san, "-", "_")
+
+	return strings.ToLower(san)
+}
+
+// Split trims and splits a provided string by comma.
+func Split(str string) []string {
+	return strings.Split(strings.ReplaceAll(str, " ", ""), ",")
+}

fxcore/util_test.go

@@ -0,0 +1,27 @@
+package fxcore_test
+
+import (
+	"testing"
+
+	"github.com/ankorstore/yokai/fxcore"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSanitize(t *testing.T) {
+	t.Parallel()
+
+	assert.Equal(t, "foo_bar", fxcore.Sanitize("foo-bar"))
+	assert.Equal(t, "foo_bar", fxcore.Sanitize("foo bar"))
+	assert.Equal(t, "foo_bar", fxcore.Sanitize("Foo-Bar"))
+	assert.Equal(t, "foo_bar", fxcore.Sanitize("Foo Bar"))
+}
+
+func TestSplit(t *testing.T) {
+	t.Parallel()
+
+	assert.Equal(t, []string{"1", "2", "3"}, fxcore.Split("1,2,3"))
+	assert.Equal(t, []string{"1", "2", "3"}, fxcore.Split(" 1,2,3"))
+	assert.Equal(t, []string{"1", "2", "3"}, fxcore.Split("1,2,3 "))
+	assert.Equal(t, []string{"1", "2", "3"}, fxcore.Split("1, 2, 3"))
+	assert.Equal(t, []string{"1", "2", "3"}, fxcore.Split(" 1, 2, 3 "))
+}