Use seconds for our duration rather than nanoseconds

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

Author: Tyler Reid

CHANGELOG.md

@@ -22,7 +22,7 @@
   * Ensure that a ring store is configured using `-alertmanager.sharding-ring.store`, and set the flags relevant to the chosen store type.
   * Enable the feature using `-alertmanager.sharding-enabled`.
   * Note the prior addition of a new configuration option `-alertmanager.persist-interval`. This sets the interval between persisting the current alertmanager state (notification log and silences) to object storage. See the [configuration file reference](https://cortexmetrics.io/docs/configuration/configuration-file/#alertmanager_config) for more information.
-* [FEATURE] Ruler: Add new `-ruler.enable-query-stats` which when enabled will report the `cortex_ruler_query_seconds_total` metric that tracks the sum of the wall time of executing queries in the ruler. #4317
+* [FEATURE] Ruler: Add new `-ruler.enable-query-stats` which when enabled will report the `cortex_ruler_query_seconds_total` metric that tracks the sum of the wall time of executing queries in the ruler in seconds. #4317
 * [ENHANCEMENT] Alertmanager: Cleanup persisted state objects from remote storage when a tenant configuration is deleted. #4167
 * [ENHANCEMENT] Storage: Added the ability to disable Open Census within GCS client (e.g `-gcs.enable-opencensus=false`). #4219
 * [ENHANCEMENT] Etcd: Added username and password to etcd config. #4205

pkg/ruler/compat.go

@@ -151,7 +151,7 @@ func MetricsQueryFunc(qf rules.QueryFunc, queries, failedQueries prometheus.Coun
 		// If we've been passed a counter vec we want to record the wall time spent executing this request.
 		if queryTime != nil {
 			startTime = time.Now()
-			defer func() { queryTime.WithLabelValues(userID).Add(float64(time.Since(startTime))) }()
+			defer func() { queryTime.WithLabelValues(userID).Add(time.Since(startTime).Seconds()) }()
 		}
 
 		result, err := qf(ctx, qs, t)

pkg/ruler/compat_test.go

@@ -248,7 +248,7 @@ func TestMetricsQueryFuncMetrics(t *testing.T) {
 	queryTime := prometheus.NewCounterVec(prometheus.CounterOpts{}, []string{"user"})
 
 	mockFunc := func(ctx context.Context, q string, t time.Time) (promql.Vector, error) {
-		time.Sleep(1 * time.Millisecond)
+		time.Sleep(1 * time.Second)
 		return promql.Vector{}, nil
 	}
 	qf := MetricsQueryFunc(mockFunc, queries, failures, queryTime, "userID")
@@ -257,5 +257,5 @@ func TestMetricsQueryFuncMetrics(t *testing.T) {
 
 	require.Equal(t, 1, int(testutil.ToFloat64(queries)))
 	require.Equal(t, 0, int(testutil.ToFloat64(failures)))
-	require.LessOrEqual(t, float64(1*time.Millisecond), testutil.ToFloat64(queryTime.WithLabelValues("userID")))
+	require.LessOrEqual(t, float64(1), testutil.ToFloat64(queryTime.WithLabelValues("userID")))
 }