use counter

Signed-off-by: Will Kutler <wkutler@redhat.com>
open-cluster-management-io · Dec 6, 2022 · 34dbc4a · 34dbc4a
1 parent b658407
commit 34dbc4a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/controllers/configurationpolicy_controller.go b/controllers/configurationpolicy_controller.go
@@ -131,8 +131,8 @@ func (r *ConfigurationPolicyReconciler) Reconcile(ctx context.Context, request c
 		_ = compareObjSecondsCounter.DeletePartialMatch(prometheus.Labels{"config_policy_name": request.Name})
 		_ = policyRelatedObjectGauge.DeletePartialMatch(
 			prometheus.Labels{"policy": fmt.Sprintf("%s/%s", request.Namespace, request.Name)})
-		_ = policyUserErrorsGauge.DeletePartialMatch(prometheus.Labels{"template": request.Name})
-		_ = policySystemErrorsGauge.DeletePartialMatch(prometheus.Labels{"template": request.Name})
+		_ = policyUserErrorsCounter.DeletePartialMatch(prometheus.Labels{"template": request.Name})
+		_ = policySystemErrorsCounter.DeletePartialMatch(prometheus.Labels{"template": request.Name})
 	}
 
 	return reconcile.Result{}, nil
@@ -589,7 +589,7 @@ func (r *ConfigurationPolicyReconciler) handleObjectTemplates(plc policyv1.Confi
 		if len(plc.OwnerReferences) > 0 {
 			parent = plc.OwnerReferences[0].Name
 		}
-		policyUserErrorsGauge.WithLabelValues(parent, plc.GetName(), "invalid-template").Add(1)
+		policyUserErrorsCounter.WithLabelValues(parent, plc.GetName(), "invalid-template").Add(1)
 
 		return
 	}
@@ -1638,7 +1638,7 @@ func (r *ConfigurationPolicyReconciler) getMapping(
 			if len(policy.OwnerReferences) > 0 {
 				parent = policy.OwnerReferences[0].Name
 			}
-			policyUserErrorsGauge.WithLabelValues(parent, policy.GetName(), "no-object-CRD").Add(1)
+			policyUserErrorsCounter.WithLabelValues(parent, policy.GetName(), "no-object-CRD").Add(1)
 		}
 
 		errMsg := err.Error()
@@ -2465,7 +2465,7 @@ func (r *ConfigurationPolicyReconciler) addForUpdate(policy *policyv1.Configurat
 		if len(policy.OwnerReferences) > 0 {
 			parent = policy.OwnerReferences[0].Name
 		}
-		policySystemErrorsGauge.WithLabelValues(parent, policy.GetName(), "status-update-failed").Add(1)
+		policySystemErrorsCounter.WithLabelValues(parent, policy.GetName(), "status-update-failed").Add(1)
 	}
 }
 

diff --git a/controllers/metric.go b/controllers/metric.go
@@ -65,8 +65,8 @@ var (
 			"policy",
 		},
 	)
-	policyUserErrorsGauge = prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
+	policyUserErrorsCounter = prometheus.NewCounterVec(
+		prometheus.CounterOpts{
 			Name: "policy_user_errors",
 			Help: "The number of user errors encountered while processing policies",
 		},
@@ -76,8 +76,8 @@ var (
 			"type",
 		},
 	)
-	policySystemErrorsGauge = prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
+	policySystemErrorsCounter = prometheus.NewCounterVec(
+		prometheus.CounterOpts{
 			Name: "policy_system_errors",
 			Help: "The number of system errors encountered while processing policies",
 		},
@@ -100,12 +100,12 @@ func init() {
 	// Error metrics may already be registered by template sync
 	alreadyReg := &prometheus.AlreadyRegisteredError{}
 
-	regErr := metrics.Registry.Register(policySystemErrorsGauge)
+	regErr := metrics.Registry.Register(policySystemErrorsCounter)
 	if regErr != nil && !errors.As(regErr, alreadyReg) {
 		panic(regErr)
 	}
 
-	regErr = metrics.Registry.Register(policyUserErrorsGauge)
+	regErr = metrics.Registry.Register(policyUserErrorsCounter)
 	if regErr != nil && !errors.As(regErr, alreadyReg) {
 		panic(regErr)
 	}

diff --git a/test/e2e/case26_user_error_metric_test.go b/test/e2e/case26_user_error_metric_test.go
@@ -5,8 +5,8 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"open-cluster-management.io/config-policy-controller/test/utils"
 )
 
@@ -33,7 +33,7 @@ var _ = Describe("Test related object metrics", Ordered, func() {
 			return utils.GetMetrics(
 				"policy_user_errors",
 			)
-		}, defaultTimeoutSeconds, 1).Should(Equal([]string{"policies", "gauge", "1"}))
+		}, defaultTimeoutSeconds, 1).Should(Equal([]string{"policies", "counter", "1"}))
 	})
 
 	cleanup := func() {