Add a format query label value to queries total metric (#6925)

Signed-off-by: SungJin1212 <[email protected]>

Author: SungJin1212

CHANGELOG.md

@@ -62,6 +62,7 @@
 * [ENHANCEMENT] Ring: Add zone label to ring_members metric. #6900
 * [ENHANCEMENT] Ingester: Add new metric `cortex_ingester_push_errors_total` to track reasons for ingester request failures. #6901
 * [ENHANCEMENT] Parquet Storage: Allow Parquet Queryable to disable fallback to Store Gateway. #6920
+* [ENHANCEMENT] Query Frontend: Add a `format_query` label value to the `op` label at `cortex_query_frontend_queries_total` metric. #6925
 * [BUGFIX] Ingester: Avoid error or early throttling when READONLY ingesters are present in the ring #6517
 * [BUGFIX] Ingester: Fix labelset data race condition. #6573
 * [BUGFIX] Compactor: Cleaner should not put deletion marker for blocks with no-compact marker. #6576

pkg/querier/tripperware/roundtrip.go

@@ -46,6 +46,7 @@ const (
 	opTypeLabelValues    = "label_values"
 	opTypeMetadata       = "metadata"
 	opTypeQueryExemplars = "query_exemplars"
+	opTypeFormatQuery    = "format_query"
 )
 
 // HandlerFunc is like http.HandlerFunc, but for Handler.
@@ -152,6 +153,7 @@ func NewQueryTripperware(
 				isLabelValues := strings.HasSuffix(r.URL.Path, "/values")
 				isMetadata := strings.HasSuffix(r.URL.Path, "/metadata")
 				isQueryExemplars := strings.HasSuffix(r.URL.Path, "/query_exemplars")
+				isFormatQuery := strings.HasSuffix(r.URL.Path, "/format_query")
 
 				op := opTypeQuery
 				switch {
@@ -169,6 +171,8 @@ func NewQueryTripperware(
 					op = opTypeMetadata
 				case isQueryExemplars:
 					op = opTypeQueryExemplars
+				case isFormatQuery:
+					op = opTypeFormatQuery
 				}
 
 				tenantIDs, err := tenant.TenantIDs(r.Context())

pkg/querier/tripperware/roundtrip_test.go

@@ -38,6 +38,7 @@ const (
 	labelNamesQuery               = "/api/v1/labels"
 	labelValuesQuery              = "/api/v1/label/label/values"
 	metadataQuery                 = "/api/v1/metadata"
+	formatQuery                   = "/api/v1/format_query?query=foo/bar"
 
 	responseBody        = `{"status":"success","data":{"resultType":"matrix","result":[{"metric":{"foo":"bar"},"values":[[1536673680,"137"],[1536673780,"137"]]}]}}`
 	instantResponseBody = `{"status":"success","data":{"resultType":"vector","result":[{"metric":{"foo":"bar"},"values":[[1536673680,"137"],[1536673780,"137"]]}]}}`
@@ -229,6 +230,18 @@ cortex_query_frontend_queries_total{op="remote_read", source="api", user="1"} 1
 # HELP cortex_query_frontend_queries_total Total queries sent per tenant.
 # TYPE cortex_query_frontend_queries_total counter
 cortex_query_frontend_queries_total{op="query_range", source="api", user="1"} 1
+`,
+		},
+		{
+			path:             formatQuery,
+			expectedBody:     "bar",
+			limits:           defaultOverrides,
+			maxSubQuerySteps: 11000,
+			userAgent:        "dummyUserAgent/1.2",
+			expectedMetric: `
+# HELP cortex_query_frontend_queries_total Total queries sent per tenant.
+# TYPE cortex_query_frontend_queries_total counter
+cortex_query_frontend_queries_total{op="format_query", source="api", user="1"} 1
 `,
 		},
 		{