move to internal/controller/metrics

Signed-off-by: dongjiang <[email protected]>

Author: dongjiang1989

pkg/internal/controller/metrics/metrics.go

@@ -17,6 +17,8 @@ limitations under the License.
 package metrics
 
 import (
+	"regexp"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
@@ -89,6 +91,13 @@ func init() {
 		// expose process metrics like CPU, Memory, file descriptor usage etc.
 		collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}),
 		// expose Go runtime metrics like GC stats, memory stats etc.
-		collectors.NewGoCollector(),
+		collectors.NewGoCollector(
+			collectors.WithGoCollectorRuntimeMetrics(
+				collectors.MetricsGC,
+				collectors.MetricsScheduler,
+				collectors.MetricsMemory,
+				collectors.GoRuntimeMetricsRule{Matcher: regexp.MustCompile(`^/sync/.*`)},
+			),
+		),
 	)
 }

pkg/metrics/registry.go

@@ -16,12 +16,7 @@ limitations under the License.
 
 package metrics
 
-import (
-	"regexp"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/collectors"
-)
+import "github.com/prometheus/client_golang/prometheus"
 
 // RegistererGatherer combines both parts of the API of a Prometheus
 // registry, both the Registerer and the Gatherer interfaces.
@@ -32,22 +27,4 @@ type RegistererGatherer interface {
 
 // Registry is a prometheus registry for storing metrics within the
 // controller-runtime.
-var Registry RegistererGatherer = NewRegistry()
-
-func NewRegistry() *prometheus.Registry {
-	r := prometheus.NewRegistry()
-
-	// default registers
-	r.MustRegister(
-		collectors.NewGoCollector(
-			collectors.WithGoCollectorRuntimeMetrics(
-				collectors.MetricsGC,
-				collectors.MetricsScheduler,
-				collectors.MetricsMemory,
-				collectors.GoRuntimeMetricsRule{Matcher: regexp.MustCompile(`^/sync/.*`)},
-			),
-		),
-		collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}),
-	)
-	return r
-}
+var Registry RegistererGatherer = prometheus.NewRegistry()