Address comments

Author: awgreene

Makefile

@@ -85,7 +85,6 @@ build-coverage: clean $(CMDS)
 
 build-linux: build_cmd=build
 build-linux: arch_flags=GOOS=linux GOARCH=386
-build-linux: BUILD_TAGS="json1 experimental_metrics"
 build-linux: clean $(CMDS)
 
 build-wait: clean bin/wait

pkg/controller/operators/adoption_controller.go

@@ -115,7 +115,7 @@ func (r *AdoptionReconciler) ReconcileSubscription(ctx context.Context, req ctrl
 	// Set up a convenient log object so we don't have to type request over and over again
 	log := r.log.WithValues("request", req)
 	log.V(1).Info("reconciling subscription")
-	metrics.EmitAdoptionSubscriptionReconcile()
+	metrics.EmitAdoptionSubscriptionReconcile(req.Namespace, req.Name)
 
 	// Fetch the Subscription from the cache
 	in := &operatorsv1alpha1.Subscription{}
@@ -178,8 +178,7 @@ func (r *AdoptionReconciler) ReconcileClusterServiceVersion(ctx context.Context,
 	// Set up a convenient log object so we don't have to type request over and over again
 	log := r.log.WithValues("request", req)
 	log.V(1).Info("reconciling csv")
-
-	metrics.EmitAdoptionCSVReconcile()
+	metrics.EmitAdoptionCSVReconcile(req.Namespace, req.Name)
 
 	// Fetch the CSV from the cache
 	in := &operatorsv1alpha1.ClusterServiceVersion{}

pkg/controller/operators/operator_controller.go

@@ -116,10 +116,10 @@ func NewOperatorReconciler(cli client.Client, log logr.Logger, scheme *runtime.S
 var _ reconcile.Reconciler = &OperatorReconciler{}
 
 func (r *OperatorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	metrics.EmitOperatorReconcile()
 	// Set up a convenient log object so we don't have to type request over and over again
 	log := r.log.WithValues("request", req)
 	log.V(1).Info("reconciling operator")
+	metrics.EmitOperatorReconcile(req.Namespace, req.Name)
 
 	// Get the Operator
 	create := false

pkg/controller/operators/operatorcondition_controller.go

@@ -92,10 +92,10 @@ func NewOperatorConditionReconciler(cli client.Client, log logr.Logger, scheme *
 var _ reconcile.Reconciler = &OperatorConditionReconciler{}
 
 func (r *OperatorConditionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	metrics.EmitOperatorConditionReconcile()
 	// Set up a convenient log object so we don't have to type request over and over again
 	log := r.log.WithValues("request", req)
 	log.V(2).Info("reconciling operatorcondition")
+	metrics.EmitOperatorConditionReconcile(req.Namespace, req.Name)
 
 	operatorCondition := &operatorsv2.OperatorCondition{}
 	err := r.Client.Get(context.TODO(), req.NamespacedName, operatorCondition)

pkg/controller/operators/operatorconditiongenerator_controller.go

@@ -89,9 +89,9 @@ func NewOperatorConditionGeneratorReconciler(cli client.Client, log logr.Logger,
 var _ reconcile.Reconciler = &OperatorConditionGeneratorReconciler{}
 
 func (r *OperatorConditionGeneratorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	metrics.EmitOperatorConditionGeneratorReconcile()
 	// Set up a convenient log object so we don't have to type request over and over again
 	log := r.log.WithValues("request", req)
+	metrics.EmitOperatorConditionGeneratorReconcile(req.Namespace, req.Name)
 
 	in := &operatorsv1alpha1.ClusterServiceVersion{}
 	err := r.Client.Get(context.TODO(), req.NamespacedName, in)

pkg/metrics/experimental_declarations.go

@@ -0,0 +1,42 @@
+package metrics
+
+import "github.com/prometheus/client_golang/prometheus"
+
+const (
+	// Controller names
+	operatorController                   = "operator"
+	adoptionCSVController                = "adoption_csv"
+	adoptionSubscriptionController       = "adoption_subscription"
+	operatorConditionController          = "operator_condition"
+	operatorConditionGeneratorController = "operator_condition_generator"
+)
+
+var (
+	reconcileMetrics = map[string]*prometheus.CounterVec{}
+)
+
+func EmitOperatorReconcile(namespace, name string) {
+	emitReconcile(operatorConditionController, namespace, name)
+}
+
+func EmitAdoptionCSVReconcile(namespace, name string) {
+	emitReconcile(adoptionCSVController, namespace, name)
+}
+
+func EmitAdoptionSubscriptionReconcile(namespace, name string) {
+	emitReconcile(adoptionSubscriptionController, namespace, name)
+}
+
+func EmitOperatorConditionReconcile(namespace, name string) {
+	emitReconcile(operatorConditionController, namespace, name)
+}
+
+func EmitOperatorConditionGeneratorReconcile(namespace, name string) {
+	emitReconcile(operatorConditionGeneratorController, namespace, name)
+}
+
+func emitReconcile(controllerName, namespace, name string) {
+	if counter, ok := reconcileMetrics[controllerName]; ok {
+		counter.WithLabelValues(namespace, name).Inc()
+	}
+}

pkg/metrics/experimental.go renamed to pkg/metrics/experimental_register.go

@@ -13,23 +13,23 @@ func init() {
 	// Register experimental metrics
 	reconcileMetrics = reconcileCounters(operatorController, adoptionCSVController, adoptionSubscriptionController, operatorConditionController, operatorConditionGeneratorController)
 	registerReconcileMetrics()
-	fmt.Printf("metrics")
 }
 
-func reconcileCounters(reconcilerNames ...string) map[string]prometheus.Counter {
-	result := map[string]prometheus.Counter{}
+func reconcileCounters(reconcilerNames ...string) map[string]*prometheus.CounterVec {
+	result := map[string]*prometheus.CounterVec{}
 	for _, s := range reconcilerNames {
 		result[s] = reconcileCounter(s)
 	}
 	return result
 }
 
-func reconcileCounter(name string) prometheus.Counter {
-	return prometheus.NewCounter(
+func reconcileCounter(name string) *prometheus.CounterVec {
+	return prometheus.NewCounterVec(
 		prometheus.CounterOpts{
 			Name: "controller_reconcile_" + name,
 			Help: fmt.Sprintf("Count of reconcile events by the %s controller", strings.Replace(name, "_", " ", -1)),
 		},
+		[]string{NAMESPACE_LABEL, NAME_LABEL},
 	)
 }
 

pkg/metrics/metrics.go

@@ -27,13 +27,6 @@ const (
 	APPROVAL_LABEL  = "approval"
 	WARNING_LABEL   = "warning"
 	GVK_LABEL       = "gvk"
-
-	// Controller names
-	operatorController                   = "operator"
-	adoptionCSVController                = "adoption_csv"
-	adoptionSubscriptionController       = "adoption_subscription"
-	operatorConditionController          = "operator_condition"
-	operatorConditionGeneratorController = "operator_condition_generator"
 )
 
 type MetricsProvider interface {
@@ -211,9 +204,6 @@ var (
 	// Subscription objects. The key of a record is the Subscription name, while the value
 	//  is struct containing label values used in the counter
 	subscriptionSyncCounters = make(map[string]subscriptionSyncLabelValues)
-
-	// Experimental Metrics
-	reconcileMetrics = map[string]prometheus.Counter{}
 )
 
 type subscriptionSyncLabelValues struct {
@@ -344,29 +334,3 @@ func RegisterDependencyResolutionFailure(duration time.Duration) {
 func EmitInstallPlanWarning() {
 	installPlanWarningCount.Inc()
 }
-
-func EmitOperatorReconcile() {
-	emitReconcile(operatorConditionController)
-}
-
-func EmitAdoptionCSVReconcile() {
-	emitReconcile(adoptionCSVController)
-}
-
-func EmitAdoptionSubscriptionReconcile() {
-	emitReconcile(adoptionSubscriptionController)
-}
-
-func EmitOperatorConditionReconcile() {
-	emitReconcile(operatorConditionController)
-}
-
-func EmitOperatorConditionGeneratorReconcile() {
-	emitReconcile(operatorConditionGeneratorController)
-}
-
-func emitReconcile(name string) {
-	if counter, ok := reconcileMetrics[name]; ok {
-		counter.Inc()
-	}
-}