Merge branch 'main' into bigcache_replacement

Author: Harshitha122

.golangci.yml

@@ -1,18 +1,17 @@
 #
 # Generated by @zondax/cli
 #
+version: "2"
 run:
   timeout: 5m
 
 linters:
   enable:
-    - gofmt
     - gosec
     - goconst
     - gocritic
     - staticcheck
     - unused
-    - gosimple
     - goconst
     - bodyclose
     - unconvert
@@ -22,5 +21,15 @@ linters:
     - copyloopvar
     - makezero
     - nilerr
-    - reassign
+    - reassign    
+  exclusions:
+    rules:
+      - source: "^\\s*defer\\s+"
+        linters:
+          - errcheck
+
+
+formatters:
+  enable:
+    - gofmt
 

pkg/metrics/handler.go

@@ -20,7 +20,7 @@ func (t *taskMetrics) performMetricAction(name string, action func(MetricHandler
 	labels = append(labels, t.appName)
 
 	t.mux.RLock()
-	metricDetail, ok := t.metrics[name]
+	metricDetail, ok := t.metrics[formatMetricName(name)]
 	t.mux.RUnlock()
 
 	if !ok {

pkg/metrics/register_test.go

@@ -3,6 +3,7 @@ package metrics
 import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/zondax/golem/pkg/metrics/collectors"
 	"testing"
 )
@@ -36,3 +37,48 @@ func TestFormatMetricName(t *testing.T) {
 		})
 	}
 }
+
+func (suite *MetricsTestSuite) TestMetricNameFormatting() {
+	tests := []struct {
+		metricName    string
+		formattedName string
+	}{
+		{
+			metricName:    "test-metric-name",
+			formattedName: "test_metric_name",
+		},
+		{
+			metricName:    "another.test@metric",
+			formattedName: "another_test_metric",
+		},
+	}
+	for _, tt := range tests {
+		suite.Run(tt.metricName, func() {
+			// Create a gauge for testing
+			realGauge := prometheus.NewGauge(prometheus.GaugeOpts{
+				Name: "test_gauge",
+				Help: "Test gauge",
+			})
+
+			// Create a new task metrics instance
+			taskMetric := &taskMetrics{
+				metrics: make(map[string]MetricDetail),
+			}
+
+			// Store the metric with a formatted name
+			taskMetric.metrics[tt.formattedName] = MetricDetail{
+				Collector: realGauge,
+				Handler:   suite.mockH,
+			}
+
+			suite.mockH.On("Update", realGauge, 1.0, mock.Anything).Return(nil).Once()
+
+			// "another.test@metric" should be formatted to "another_test_metric"
+			err := taskMetric.UpdateMetric(tt.metricName, 1.0)
+
+			// Verify there are no errors and the mock expectations are met
+			suite.Nil(err)
+			suite.mockH.AssertExpectations(suite.T())
+		})
+	}
+}