fix: Init metrics (#175)

* add register for all

* add register call and start server afterwards

* retrigger jobs

* fix merge

Author: lindnerby

runtime-watcher/internal/watchermetrics/metrics.go

@@ -53,10 +53,17 @@ func NewMetrics() *WatcherMetrics {
 			Help: "Indicates total failed requests to KCP count",
 		}, []string{kcpErrReasonLabel}),
 	}
-
 	return metrics
 }
 
+func (w *WatcherMetrics) RegisterAll() {
+	prometheus.MustRegister(w.requestDurationGauge)
+	prometheus.MustRegister(w.admissionRequestsErrorTotalCounter)
+	prometheus.MustRegister(w.admissionRequestsTotalCounter)
+	prometheus.MustRegister(w.kcpRequestsTotalCounter)
+	prometheus.MustRegister(w.failedKCPRequestsTotalCounter)
+}
+
 func (w *WatcherMetrics) UpdateRequestDuration(duration time.Duration) {
 	w.requestDurationGauge.Set(duration.Seconds())
 }

runtime-watcher/main.go

@@ -68,6 +68,16 @@ func main() {
 		return
 	}
 
+	restConfig := ctrl.GetConfigOrDie()
+	restClient, err := client.New(restConfig, client.Options{})
+	if err != nil {
+		logger.Error(err, "rest client could not be determined for skr-webhook")
+		return
+	}
+	decoder := serializer.NewCodecFactory(runtime.NewScheme()).UniversalDeserializer()
+	requestParser := requestparser.NewRequestParser(decoder)
+	metrics := watchermetrics.NewMetrics()
+	metrics.RegisterAll()
 	http.Handle("/metrics", promhttp.Handler())
 	metricsServer := &http.Server{
 		Addr:              fmt.Sprintf(":%d", config.MetricsPort),
@@ -78,15 +88,6 @@ func main() {
 		logger.Error(err, "failed to wire up metrics endpoint")
 	}
 
-	restConfig := ctrl.GetConfigOrDie()
-	restClient, err := client.New(restConfig, client.Options{})
-	if err != nil {
-		logger.Error(err, "rest client could not be determined for skr-webhook")
-		return
-	}
-	decoder := serializer.NewCodecFactory(runtime.NewScheme()).UniversalDeserializer()
-	requestParser := requestparser.NewRequestParser(decoder)
-	metrics := watchermetrics.NewMetrics()
 	handler := internal.NewHandler(restClient, logger, config, *requestParser, *metrics)
 	http.HandleFunc("/validate/", handler.Handle)
 	server := http.Server{