Change to keda_scaled_job_errors

Signed-off-by: Yoon Park <[email protected]>
kedacore · Dec 23, 2023 · f3bd3ce · f3bd3ce
1 parent a30e252
commit f3bd3ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/metricscollector/prommetrics.go b/pkg/metricscollector/prommetrics.go
@@ -239,7 +239,7 @@ func (p *PromMetrics) RecordScaledObjectError(namespace string, scaledObject str
 func (p *PromMetrics) RecordScaledJobError(namespace string, scaledJob string, err error) {
 	labels := prometheus.Labels{"namespace": namespace, "scaledJob": scaledJob}
 	if err != nil {
-		scaledObjectErrors.With(labels).Inc()
+		scaledJobErrors.With(labels).Inc()
 		return
 	}
 	// initialize metric with 0 if not already set

diff --git a/tests/sequential/opentelemetry_metrics/opentelemetry_metrics_test.go b/tests/sequential/opentelemetry_metrics/opentelemetry_metrics_test.go
@@ -474,17 +474,17 @@ func testScaledJobErrors(t *testing.T, data templateData) {
 	time.Sleep(20 * time.Second)
 
 	family := fetchAndParsePrometheusMetrics(t, fmt.Sprintf("curl --insecure %s", kedaOperatorCollectorPrometheusExportURL))
-	val, ok := family["keda_scaledjob_errors_total"]
-	assert.True(t, ok, "keda_scaledjob_errors_total not available")
+	val, ok := family["keda_scaledjob_errors"]
+	assert.True(t, ok, "keda_scaledjob_errors not available")
 	if ok {
 		errCounterVal1 := getErrorMetricsValue(val)
 
 		// wait for 2 seconds as pollinginterval is 2
 		time.Sleep(5 * time.Second)
 
 		family = fetchAndParsePrometheusMetrics(t, fmt.Sprintf("curl --insecure %s", kedaOperatorCollectorPrometheusExportURL))
-		val, ok := family["keda_scaledjob_errors_total"]
-		assert.True(t, ok, "keda_scaledjob_errors_total not available")
+		val, ok := family["keda_scaledjob_errors"]
+		assert.True(t, ok, "keda_scaledjob_errors not available")
 		if ok {
 			errCounterVal2 := getErrorMetricsValue(val)
 			assert.NotEqual(t, errCounterVal2, float64(0))
@@ -549,7 +549,7 @@ func getErrorMetricsValue(val *prommodel.MetricFamily) float64 {
 				}
 			}
 		}
-	case "keda_scaledjob_errors_total":
+	case "keda_scaled_job_errors":
 		metrics := val.GetMetric()
 		for _, metric := range metrics {
 			labels := metric.GetLabel()