update log message for ruler query metrics

Signed-off-by: Tyler Reid <[email protected]>

Author: Tyler Reid

pkg/ruler/compat.go

@@ -177,9 +177,11 @@ func RecordAndReportRuleQueryMetrics(qf rules.QueryFunc, queryTime prometheus.Co
 
 			// Log ruler query stats.
 			logMessage := append([]interface{}{
-				"msg", "ruler query stats",
+				"msg", "query stats",
+				"component", "ruler",
 				"cortex_ruler_query_seconds_total", querySeconds,
-			}, qs)
+				"query", qs,
+			})
 			level.Info(util_log.WithContext(ctx, logger)).Log(logMessage...)
 		}()
 

pkg/ruler/compat_test.go

@@ -243,19 +243,14 @@ func TestMetricsQueryFuncErrors(t *testing.T) {
 }
 
 func TestRecordAndReportRuleQueryMetrics(t *testing.T) {
-	queries := prometheus.NewCounter(prometheus.CounterOpts{})
-	failures := prometheus.NewCounter(prometheus.CounterOpts{})
 	queryTime := prometheus.NewCounterVec(prometheus.CounterOpts{}, []string{"user"})
 
 	mockFunc := func(ctx context.Context, q string, t time.Time) (promql.Vector, error) {
 		time.Sleep(1 * time.Second)
 		return promql.Vector{}, nil
 	}
-	qf := RecordAndReportRuleQueryMetrics(MetricsQueryFunc(mockFunc, queries, failures), queryTime.WithLabelValues("userID"), log.NewNopLogger())
-
+	qf := RecordAndReportRuleQueryMetrics(mockFunc, queryTime.WithLabelValues("userID"), log.NewNopLogger())
 	_, _ = qf(context.Background(), "test", time.Now())
 
-	require.Equal(t, 1, int(testutil.ToFloat64(queries)))
-	require.Equal(t, 0, int(testutil.ToFloat64(failures)))
 	require.GreaterOrEqual(t, testutil.ToFloat64(queryTime.WithLabelValues("userID")), float64(1))
 }