addressing PR comments

Author: Shawn Hurley

pkg/sdk/informer-sync.go

@@ -88,9 +88,9 @@ func (i *informer) sync(key string) error {
 	}
 	switch {
 	case err == nil:
-		i.metrics.SyncEvents.WithLabelValues(metrics.SyncResultSuccess).Inc()
+		i.metrics.ReconcileResult.WithLabelValues(metrics.SyncResultSuccess).Inc()
 	case err != nil:
-		i.metrics.SyncEvents.WithLabelValues(metrics.SyncResultFailure).Inc()
+		i.metrics.ReconcileResult.WithLabelValues(metrics.SyncResultFailure).Inc()
 	}
 	return err
 }

pkg/sdk/informer.go

@@ -19,6 +19,7 @@ import (
 	"time"
 
 	"github.com/operator-framework/operator-sdk/pkg/sdk/metrics"
+
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -99,7 +100,7 @@ func (i *informer) handleAddResourceEvent(obj interface{}) {
 	if err != nil {
 		panic(err)
 	}
-	i.metrics.Events.WithLabelValues(metrics.EventTypeAdd).Inc()
+	i.metrics.EventType.WithLabelValues(metrics.EventTypeAdd).Inc()
 	i.queue.Add(key)
 }
 
@@ -114,7 +115,7 @@ func (i *informer) handleDeleteResourceEvent(obj interface{}) {
 	// TODO: Revisit the need for passing delete events to the handler
 	// Save the last known state for the deleted object
 	i.deletedObjects[key] = obj.(*unstructured.Unstructured).DeepCopy()
-	i.metrics.Events.WithLabelValues(metrics.EventTypeDelete).Inc()
+	i.metrics.EventType.WithLabelValues(metrics.EventTypeDelete).Inc()
 
 	i.queue.Add(key)
 }
@@ -124,6 +125,6 @@ func (i *informer) handleUpdateResourceEvent(oldObj, newObj interface{}) {
 	if err != nil {
 		panic(err)
 	}
-	i.metrics.Events.WithLabelValues(metrics.EventTypeUpdate).Inc()
+	i.metrics.EventType.WithLabelValues(metrics.EventTypeUpdate).Inc()
 	i.queue.Add(key)
 }

pkg/sdk/metrics/metrics.go

@@ -8,8 +8,8 @@ import (
 )
 
 const (
-	eventsMetricName     = "operator_sdk_events"
-	syncEventsMetricName = "operator_sdk_sync_events"
+	eventsMetricName     = "operator_sdk_event_type"
+	syncEventsMetricName = "operator_sdk_reconcile_result"
 	// EventTypeLabel - metric label for event type
 	EventTypeLabel = "type"
 	// EventTypeAdd - addition event label
@@ -32,45 +32,43 @@ var (
 
 // Collector - metric collector for all the metrics the sdk will watch
 type Collector struct {
-	Events     *prom.CounterVec
-	SyncEvents *prom.CounterVec
+	EventType       *prom.CounterVec
+	ReconcileResult *prom.CounterVec
 }
 
 // New - create a new Collector
 func New() *Collector {
 	return &Collector{
-		Events: prom.NewCounterVec(prom.CounterOpts{
+		EventType: prom.NewCounterVec(prom.CounterOpts{
 			Name: eventsMetricName,
-			Help: "Events that the sdk has recieved, segmented by type(add or delete or update)",
+			Help: "events that the sdk has recieved, segmented by type(add or delete or update)",
 		}, []string{EventTypeLabel}),
-		SyncEvents: prom.NewCounterVec(prom.CounterOpts{
+		ReconcileResult: prom.NewCounterVec(prom.CounterOpts{
 			Name: syncEventsMetricName,
-			Help: "events that the sdk has processed segmented by result(success or failure) includes reconcilation events.",
+			Help: "reconcilation events that the sdk has processed segmented by result(success or failure)",
 		}, []string{SyncResultLabel}),
 	}
 }
 
-// RegisterCollector - add collector safetly to prometheus
+// RegisterCollector - add collector safely to prometheus
 func RegisterCollector(c *Collector) {
-	defer func() {
-		if r := recover(); r != nil {
-			logrus.Errorf("unable to add metrics to prometheus: %v", r)
-		}
-	}()
 	once.Do(func() {
-		prom.MustRegister(c)
+		err := prom.Register(c)
+		if err != nil {
+			logrus.Errorf("unable to register collector with prometheus: %v", err)
+		}
 	})
 }
 
 // Describe returns all the descriptions of the collector
 func (s *Collector) Describe(ch chan<- *prom.Desc) {
-	s.Events.Describe(ch)
-	s.SyncEvents.Describe(ch)
+	s.EventType.Describe(ch)
+	s.ReconcileResult.Describe(ch)
 
 }
 
-// Collect returns the current ssstate of the metrics
+// Collect returns the current state of the metrics
 func (s *Collector) Collect(ch chan<- prom.Metric) {
-	s.Events.Collect(ch)
-	s.SyncEvents.Collect(ch)
+	s.EventType.Collect(ch)
+	s.ReconcileResult.Collect(ch)
 }