remove metrics changes

Author: estroz

pkg/sdk/internal/metrics/metrics.go

@@ -15,10 +15,10 @@
 package metrics
 
 import (
-	"fmt"
 	"sync"
 
 	prom "github.com/prometheus/client_golang/prometheus"
+	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 )
 
 const (
@@ -42,6 +42,7 @@ const (
 
 var (
 	once sync.Once
+	log  = logf.Log.WithName("metrics")
 )
 
 // Collector - metric collector for all the metrics the sdk will watch
@@ -65,15 +66,13 @@ func New() *Collector {
 }
 
 // RegisterCollector - add collector safely to prometheus
-func RegisterCollector(c *Collector) error {
-	errCh := make(chan error)
+func RegisterCollector(c *Collector) {
 	once.Do(func() {
-		errCh <- prom.Register(c)
+		err := prom.Register(c)
+		if err != nil {
+			log.Error(err, "unable to register collector with prometheus")
+		}
 	})
-	if err := <-errCh; err != nil {
-		return fmt.Errorf("unable to register collector with prometheus: %v", err)
-	}
-	return nil
 }
 
 // Describe returns all the descriptions of the collector

pkg/sdk/metrics.go

@@ -16,7 +16,6 @@ package sdk
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"strconv"
 
@@ -33,13 +32,14 @@ import (
 var log = logf.Log.WithName("metrics")
 
 // ExposeMetricsPort generate a Kubernetes Service to expose metrics port
-func ExposeMetricsPort() (*v1.Service, error) {
+func ExposeMetricsPort() *v1.Service {
 	http.Handle("/"+k8sutil.PrometheusMetricsPortName, promhttp.Handler())
 	go http.ListenAndServe(":"+strconv.Itoa(k8sutil.PrometheusMetricsPort), nil)
 
 	service, err := k8sutil.InitOperatorService()
 	if err != nil {
-		return nil, fmt.Errorf("failed to initialize service object for operator metrics: %v", err)
+		log.Error(err, "failed to initialize service object for operator metrics")
+		return nil
 	}
 	kubeconfig, err := config.GetConfig()
 	if err != nil {
@@ -51,9 +51,10 @@ func ExposeMetricsPort() (*v1.Service, error) {
 	}
 	err = runtimeClient.Create(context.TODO(), service)
 	if err != nil && !errors.IsAlreadyExists(err) {
-		return nil, fmt.Errorf("failed to create service for operator metrics: %v", err)
+		log.Error(err, "failed to create service for operator metrics")
+		return nil
 	}
 
 	log.Info("Metrics service created.", "ServiceName", service.Name)
-	return service, nil
+	return service
 }