Merge pull request #6966 from mindw/mindw/add_proc_go_build_metrics

cert-manager-prow[bot] · web-flow · commit 9c28f4dc26df · 2024-06-21T19:21:00.000Z
Add process and go runtime metrics for controller
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -32,6 +32,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"k8s.io/utils/clock"
 
@@ -186,10 +187,16 @@ 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{}),
+		collectors.NewGoCollector(),
+	)
 	// Create server and register Prometheus metrics handler
 	m := &Metrics{
 		log:      log.WithName("metrics"),
-		registry: prometheus.NewRegistry(),
+		registry: registry,
 
 		clockTimeSeconds:                   clockTimeSeconds,
 		clockTimeSecondsGauge:              clockTimeSecondsGauge,
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.< 5651 span class=pl-c1>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`	`}`