pkg/*metrics*: metrics functions now return errors and use SDK package logger

Author: estroz

pkg/sdk/internal/metrics/metrics.go

@@ -15,10 +15,10 @@
 package metrics
 
 import (
+	"fmt"
 	"sync"
 
 	prom "github.com/prometheus/client_golang/prometheus"
-	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -65,13 +65,15 @@ func New() *Collector {
 }
 
 // RegisterCollector - add collector safely to prometheus
-func RegisterCollector(c *Collector) {
+func RegisterCollector(c *Collector) error {
+	errCh := make(chan error)
 	once.Do(func() {
-		err := prom.Register(c)
-		if err != nil {
-			logrus.Errorf("unable to register collector with prometheus: %v", err)
-		}
+		errCh <- prom.Register(c)
 	})
+	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,27 +16,28 @@ package sdk
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"strconv"
 
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
+	"github.com/operator-framework/operator-sdk/pkg/sdk/log"
+
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
 // ExposeMetricsPort generate a Kubernetes Service to expose metrics port
-func ExposeMetricsPort() *v1.Service {
+func ExposeMetricsPort() (*v1.Service, error) {
 	http.Handle("/"+k8sutil.PrometheusMetricsPortName, promhttp.Handler())
 	go http.ListenAndServe(":"+strconv.Itoa(k8sutil.PrometheusMetricsPort), nil)
 
 	service, err := k8sutil.InitOperatorService()
 	if err != nil {
-		logrus.Errorf("failed to initialize service object for operator metrics: %v", err)
-		return nil
+		return nil, fmt.Errorf("failed to initialize service object for operator metrics: %v", err)
 	}
 	kubeconfig, err := config.GetConfig()
 	if err != nil {
@@ -48,9 +49,9 @@ func ExposeMetricsPort() *v1.Service {
 	}
 	err = runtimeClient.Create(context.TODO(), service)
 	if err != nil && !errors.IsAlreadyExists(err) {
-		logrus.Errorf("failed to create service for operator metrics: %v", err)
-		return nil
+		return nil, fmt.Errorf("failed to create service for operator metrics: %v", err)
 	}
-	logrus.Infof("Metrics service %s created", service.Name)
-	return service
+
+	log.Info(fmt.Sprintf("Metrics service %s created", service.Name), "ServiceName", service.Name)
+	return service, nil
 }