Fix misplaced parentheses in integration tests (#7432)

* Fix misplaced parentheses in WaitSumMetricsWithOptions calls

e2e.WithLabelMatchers options were being passed as msgAndArgs to
require.NoError instead of as options to WaitSumMetricsWithOptions,
silently disabling label filtering in 5 integration test assertions.

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

* fix Test_Ruler_UTF8

Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>

---------

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
Co-authored-by: SungJin1212 <tjdwls1201@gmail.com>

Author: friedrichg

integration/alertmanager_test.go

@@ -95,12 +95,12 @@ func TestAlertmanagerWithUserIndexUpdater(t *testing.T) {
 
 	require.NoError(t, s.StartAndWaitReady(am))
 	// To make sure user index file is updated/scanned
-	require.NoError(t, am.WaitSumMetricsWithOptions(e2e.Greater(float64(0)), []string{"cortex_user_index_last_successful_update_timestamp_seconds"}),
+	require.NoError(t, am.WaitSumMetricsWithOptions(e2e.Greater(float64(0)), []string{"cortex_user_index_last_successful_update_timestamp_seconds"},
 		e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "component", "alertmanager")),
-	)
-	require.NoError(t, am.WaitSumMetricsWithOptions(e2e.GreaterOrEqual(float64(1)), []string{"cortex_user_index_scan_succeeded_total"}),
+	))
+	require.NoError(t, am.WaitSumMetricsWithOptions(e2e.GreaterOrEqual(float64(1)), []string{"cortex_user_index_scan_succeeded_total"},
 		e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "component", "alertmanager")),
-	)
+	))
 }
 
 func TestAlertmanagerStoreAPI(t *testing.T) {

integration/ruler_test.go

@@ -192,13 +192,13 @@ func TestRulerWithUserIndexUpdater(t *testing.T) {
 	require.NoError(t, c.SetRuleGroup(ruleGroup, ns))
 
 	// To make sure user index file is updated/scanned
-	require.NoError(t, ruler.WaitSumMetricsWithOptions(e2e.Greater(float64(0)), []string{"cortex_user_index_last_successful_update_timestamp_seconds"}),
+	require.NoError(t, ruler.WaitSumMetricsWithOptions(e2e.Greater(float64(0)), []string{"cortex_user_index_last_successful_update_timestamp_seconds"},
 		e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "component", "ruler")),
-	)
+	))
 
-	require.NoError(t, ruler.WaitSumMetricsWithOptions(e2e.GreaterOrEqual(float64(1)), []string{"cortex_user_index_scan_succeeded_total"}),
+	require.NoError(t, ruler.WaitSumMetricsWithOptions(e2e.GreaterOrEqual(float64(1)), []string{"cortex_user_index_scan_succeeded_total"},
 		e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "component", "ruler")),
-	)
+	))
 }
 
 func TestRulerAPISingleBinary(t *testing.T) {

integration/utf8_test.go

@@ -164,7 +164,7 @@ overrides:
 
 	err = c.SetRuleGroup(ruleGroup, "namespace")
 	require.NoError(t, err)
-	require.NoError(t, cortex.WaitSumMetricsWithOptions(e2e.Equals(1), []string{"cortex_ruler_managers_total"}), e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "user", "user-1")))
+	require.NoError(t, cortex.WaitSumMetrics(e2e.Equals(1), "cortex_ruler_managers_total"))
 	require.NoError(t, cortex.WaitSumMetricsWithOptions(e2e.Equals(1), []string{"cortex_ruler_rule_groups_in_store"}, e2e.WithLabelMatchers(
 		labels.MustNewMatcher(labels.MatchEqual, "user", "user-1")),
 		e2e.WaitMissingMetrics,