reduced go metrics to default minimum.

mindw · mindw · commit ae99a23b3faa · 2024-06-21T15:01:09.000+03:00
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -28,7 +28,6 @@ package metrics
 import (
 	"net"
 	"net/http"
-	"regexp"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -190,12 +189,9 @@ func New(log logr.Logger, c clock.Clock) *Metrics {
 
 	// Create Registry and register the recommended collectors
 	registry := prometheus.NewRegistry()
-	registry.MustRegister(collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}))
 	registry.MustRegister(
-		collectors.NewGoCollector(
-			collectors.WithGoCollectorRuntimeMetrics(collectors.MetricsAll),
-			collectors.WithoutGoCollectorRuntimeMetrics(regexp.MustCompile("^/godebug/.*")),
-		),
+		collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}),
+		collectors.NewGoCollector(),
 	)
 	// Create server and register Prometheus metrics handler
 	m := &Metrics{
diff --git a/test/integration/certificates/metrics_controller_test.go b/test/integration/certificates/metrics_controller_test.go
@@ -145,7 +145,8 @@ func TestMetricsController(t *testing.T) {
 			return err
 		}
 
-		if strings.TrimSpace(string(output)) != strings.TrimSpace(expectedOutput) {
+		trimmedOutput := strings.SplitN(string(output), "# HELP go_gc_duration_seconds", 2)[0]
+		if strings.TrimSpace(trimmedOutput) != strings.TrimSpace(expectedOutput) {
 			return fmt.Errorf("got unexpected metrics output\nexp:\n%s\ngot:\n%s\n",
 				expectedOutput, output)
 		}

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,8 @@ func TestMetricsController(t *testing.T) {`
`145`	`145`	`return err`
`146`	`146`	`}`
`147`	`147`
`148`		`- if strings.TrimSpace(string(output)) != strings.TrimSpace(expectedOutput) {`
	`148`	`+ trimmedOutput := strings.SplitN(string(output), "# HELP go_gc_duration_seconds", 2)[0]`
	`149`	`+ if strings.TrimSpace(trimmedOutput) != strings.TrimSpace(expectedOutput) {`
`149`	`150`	`return fmt.Errorf("got unexpected metrics output\nexp:\n%s\ngot:\n%s\n",`
`150`	`151`	`expectedOutput, output)`
`151`	`152`	`}`