Rename time_taken to time_taken_ms

CHANGELOG.md

@@ -42,6 +42,7 @@
 * [ENHANCEMENT] Ring: Add ring metric to count number of duplicate tokens. #7626
 * [ENHANCEMENT] Metrics: Add native histogram support to all remaining production histograms, enabling dual-format (classic + native) exposition across all Cortex components. #7636
 * [ENHANCEMENT] Ring: Cache `ShuffleShardWithLookback` subrings. The cached entry is invalidated on topology change or once `now` reaches the earliest `RegisteredTimestamp + lookbackPeriod` of any included instance. #7628
+* [ENHANCEMENT] Query Frontend: Rename `time_taken` field to `time_taken_ms` and make it return millisecond count. #7649
 * [BUGFIX] Querier: Fix queryWithRetry and labelsWithRetry returning (nil, nil) on cancelled context by propagating ctx.Err(). #7370
 * [BUGFIX] Metrics Helper: Fix non-deterministic bucket order in merged histograms by sorting buckets after map iteration, matching Prometheus client library behavior. #7380
 * [BUGFIX] Distributor: Return HTTP 401 Unauthorized when tenant ID resolution fails in the Prometheus Remote Write 2.0 path. #7389

pkg/frontend/transport/handler.go

@@ -430,7 +430,7 @@ func (f *Handler) reportSlowQuery(r *http.Request, queryString url.Values, query
 		"host", r.Host,
 		"path", r.URL.Path,
 		"source", source,
-		"time_taken", queryResponseTime.String(),
+		"time_taken_ms", queryResponseTime.Milliseconds(),
 	}
 
 	grafanaFields := formatGrafanaStatsFields(r)

pkg/frontend/transport/handler_test.go

@@ -614,25 +614,25 @@ func TestReportSlowQueryFormat(t *testing.T) {
 	tests := map[string]testCase{
 		"should log only base fields when stats and headers are empty": {
 			source:      requestmeta.SourceAPI,
-			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken=1s`,
+			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken_ms=1000`,
 		},
 		"should log only base fields when stats is nil": {
 			source:      requestmeta.SourceAPI,
 			queryStats:  nil,
-			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken=1s`,
+			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken_ms=1000`,
 		},
 		"should include the query string at the end": {
 			source:      requestmeta.SourceAPI,
 			queryString: url.Values(map[string][]string{"query": {"up"}}),
-			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken=1s param_query=up`,
+			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken_ms=1000 param_query=up`,
 		},
 		"should include grafana dashboard and panel id": {
 			source: requestmeta.SourceAPI,
 			header: http.Header{
 				"X-Dashboard-Uid": []string{"dashboard-1"},
 				"X-Panel-Id":      []string{"panel-1"},
 			},
-			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken=1s X-Dashboard-Uid=dashboard-1 X-Panel-Id=panel-1`,
+			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken_ms=1000 X-Dashboard-Uid=dashboard-1 X-Panel-Id=panel-1`,
 		},
 		"should include user agent, engine type and block store type headers": {
 			source: requestmeta.SourceAPI,
@@ -641,7 +641,7 @@ func TestReportSlowQueryFormat(t *testing.T) {
 				http.CanonicalHeaderKey(engine.TypeHeader):            []string{string(engine.Thanos)},
 				http.CanonicalHeaderKey(querier.BlockStoreTypeHeader): []string{"parquet"},
 			},
-			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken=1s user_agent=Grafana engine_type=thanos block_store_type=parquet`,
+			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken_ms=1000 user_agent=Grafana engine_type=thanos block_store_type=parquet`,
 		},
 		"should include query stats fields when set": {
 			source: requestmeta.SourceAPI,
@@ -658,7 +658,7 @@ func TestReportSlowQueryFormat(t *testing.T) {
 					SplitQueries:         10,
 				},
 			},
-			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken=1s query_wall_time_seconds=3 query_storage_wall_time_seconds=6000 fetched_series_count=100 fetched_chunks_count=200 fetched_samples_count=300 samples_scanned=400 fetched_chunks_bytes=1024 fetched_data_bytes=2048 split_queries=10`,
+			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken_ms=1000 query_wall_time_seconds=3 query_storage_wall_time_seconds=6000 fetched_series_count=100 fetched_chunks_count=200 fetched_samples_count=300 samples_scanned=400 fetched_chunks_bytes=1024 fetched_data_bytes=2048 split_queries=10`,
 		},
 		"should not include query stats fields that are zero": {
 			source: requestmeta.SourceAPI,
@@ -668,7 +668,7 @@ func TestReportSlowQueryFormat(t *testing.T) {
 					FetchedSeriesCount: 100,
 				},
 			},
-			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken=1s query_wall_time_seconds=3 fetched_series_count=100`,
+			expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken_ms=1000 query_wall_time_seconds=3 fetched_series_count=100`,
 		},
 	}