Fix tests

Signed-off-by: Justin Jung <[email protected]>
cortexproject · Nov 9, 2023 · e718607 · e718607
1 parent 0f8f2be
commit e718607
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/docs/configuration/single-process-config-blocks-local.yaml b/docs/configuration/single-process-config-blocks-local.yaml
@@ -87,4 +87,4 @@ ruler:
 ruler_storage:
   backend: local
   local:
-    directory: /tmp/cortex/rules
+    directory: /tmp/cortex/rules
diff --git a/pkg/frontend/v1/frontend.go b/pkg/frontend/v1/frontend.go
@@ -176,8 +176,12 @@ func (f *Frontend) stopping(_ error) error {
 }
 
 func (f *Frontend) cleanupInactiveUserMetrics(user string) {
-	f.queueLength.DeleteLabelValues(user)
-	f.discardedRequests.DeleteLabelValues(user)
+	f.queueLength.DeletePartialMatch(prometheus.Labels{
+		"user": user,
+	})
+	f.discardedRequests.DeletePartialMatch(prometheus.Labels{
+		"user": user,
+	})
 }
 
 // RoundTripGRPC round trips a proto (instead of a HTTP request).

diff --git a/pkg/frontend/v1/frontend_test.go b/pkg/frontend/v1/frontend_test.go
@@ -211,7 +211,7 @@ func TestFrontendMetricsCleanup(t *testing.T) {
 			require.NoError(t, testutil.GatherAndCompare(reg, strings.NewReader(`
 				# HELP cortex_query_frontend_queue_length Number of queries in the queue.
 				# TYPE cortex_query_frontend_queue_length gauge
-				cortex_query_frontend_queue_length{user="1"} 0
+				cortex_query_frontend_queue_length{priority="0",user="1"} 0
 			`), "cortex_query_frontend_queue_length"))
 
 			fr.cleanupInactiveUserMetrics("1")

diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -520,8 +520,12 @@ func (s *Scheduler) stopping(_ error) error {
 }
 
 func (s *Scheduler) cleanupMetricsForInactiveUser(user string) {
-	s.queueLength.DeleteLabelValues(user)
-	s.discardedRequests.DeleteLabelValues(user)
+	s.queueLength.DeletePartialMatch(prometheus.Labels{
+		"user": user,
+	})
+	s.discardedRequests.DeletePartialMatch(prometheus.Labels{
+		"user": user,
+	})
 }
 
 func (s *Scheduler) getConnectedFrontendClientsMetric() float64 {

diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go
@@ -430,16 +430,16 @@ func TestSchedulerMetrics(t *testing.T) {
 	require.NoError(t, promtest.GatherAndCompare(reg, strings.NewReader(`
 		# HELP cortex_query_scheduler_queue_length Number of queries in the queue.
 		# TYPE cortex_query_scheduler_queue_length gauge
-		cortex_query_scheduler_queue_length{user="another"} 1
-		cortex_query_scheduler_queue_length{user="test"} 1
+		cortex_query_scheduler_queue_length{priority="0",user="another"} 1
+		cortex_query_scheduler_queue_length{priority="0",user="test"} 1
 	`), "cortex_query_scheduler_queue_length"))
 
 	scheduler.cleanupMetricsForInactiveUser("test")
 
 	require.NoError(t, promtest.GatherAndCompare(reg, strings.NewReader(`
 		# HELP cortex_query_scheduler_queue_length Number of queries in the queue.
 		# TYPE cortex_query_scheduler_queue_length gauge
-		cortex_query_scheduler_queue_length{user="another"} 1
+		cortex_query_scheduler_queue_length{priority="0",user="another"} 1
 	`), "cortex_query_scheduler_queue_length"))
 }