Rename LabelNames constants from *_LABELS to *_LABEL_NAMES

Disambiguates LabelNames<N> (name-only templates) from Labels<N>
(name+value pairs) at the call site.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Mallets

quickwit/quickwit-control-plane/src/metrics.rs

@@ -51,7 +51,7 @@ pub(crate) static OPEN_SHARDS: LazyLock<Gauge> =
 pub(crate) static CLOSED_SHARDS: LazyLock<Gauge> =
     LazyLock::new(|| gauge!(parent: SHARDS, "state" => "closed"));
 
-pub(crate) const INDEX_ID_LABELS: LabelNames<1> = label_names!("index_id");
+pub(crate) const INDEX_ID_LABEL_NAMES: LabelNames<1> = label_names!("index_id");
 
 static INDEXED_SHARDS: LazyLock<Gauge> = LazyLock::new(|| {
     gauge!(

quickwit/quickwit-control-plane/src/model/shard_table.rs

@@ -27,7 +27,7 @@ use quickwit_proto::ingest::{Shard, ShardState};
 use quickwit_proto::types::{IndexUid, NodeId, ShardId, SourceId, SourceUid};
 use tracing::{error, info, warn};
 
-use crate::metrics::{CLOSED_SHARDS, INDEX_ID_LABELS, OPEN_SHARDS};
+use crate::metrics::{CLOSED_SHARDS, INDEX_ID_LABEL_NAMES, OPEN_SHARDS};
 
 /// Limits the number of scale up operations that can happen to a source to 5 per minute.
 const SCALING_UP_RATE_LIMITER_SETTINGS: RateLimiterSettings = RateLimiterSettings {
@@ -464,7 +464,7 @@ impl ShardTable {
         // can update the metrics for this specific index.
         if index_label == index_id {
             let shard_stats = table_entry.shards_stats();
-            let labels = label_values!(INDEX_ID_LABELS => index_label.to_string());
+            let labels = label_values!(INDEX_ID_LABEL_NAMES => index_label.to_string());
             gauge!(parent: OPEN_SHARDS, labels: [labels]).set(shard_stats.num_open_shards as f64);
             gauge!(parent: CLOSED_SHARDS, labels: [labels])
                 .set(shard_stats.num_closed_shards as f64);
@@ -481,7 +481,7 @@ impl ShardTable {
                 num_closed_shards += 1;
             }
         }
-        let labels = label_values!(INDEX_ID_LABELS => index_label.to_string());
+        let labels = label_values!(INDEX_ID_LABEL_NAMES => index_label.to_string());
         gauge!(parent: OPEN_SHARDS, labels: [labels]).set(num_open_shards as f64);
         gauge!(parent: CLOSED_SHARDS, labels: [labels]).set(num_closed_shards as f64);
     }

quickwit/quickwit-jaeger/src/lib.rs

@@ -53,8 +53,8 @@ use tracing::field::Empty;
 use tracing::{Span as RuntimeSpan, debug, error, instrument, warn};
 
 use crate::metrics::{
-    FETCHED_SPANS_TOTAL, FETCHED_TRACES_TOTAL, OPERATION_INDEX_ERROR_LABELS,
-    OPERATION_INDEX_LABELS, REQUEST_DURATION_SECONDS, REQUEST_ERRORS_TOTAL,
+    FETCHED_SPANS_TOTAL, FETCHED_TRACES_TOTAL, OPERATION_INDEX_ERROR_LABEL_NAMES,
+    OPERATION_INDEX_LABEL_NAMES, REQUEST_DURATION_SECONDS, REQUEST_ERRORS_TOTAL,
     TRANSFERRED_BYTES_TOTAL,
 };
 
@@ -421,13 +421,13 @@ impl JaegerService {
             current_span.record("num_bytes", num_bytes_total);
 
             let labels = label_values!(
-                OPERATION_INDEX_LABELS => operation_name, OTEL_TRACES_INDEX_ID
+                OPERATION_INDEX_LABEL_NAMES => operation_name, OTEL_TRACES_INDEX_ID
             );
             counter!(parent: FETCHED_TRACES_TOTAL, labels: [labels]).increment(num_traces);
 
             let elapsed = request_start.elapsed().as_secs_f64();
             let err_labels = label_values!(
-                OPERATION_INDEX_ERROR_LABELS =>
+                OPERATION_INDEX_ERROR_LABEL_NAMES =>
                 operation_name, OTEL_TRACES_INDEX_ID, "false"
             );
             histogram!(parent: REQUEST_DURATION_SECONDS, labels: [err_labels]).record(elapsed);
@@ -437,18 +437,18 @@ impl JaegerService {
 }
 
 pub(crate) fn record_error(operation_name: &'static str, request_start: Instant) {
-    let labels = label_values!(OPERATION_INDEX_LABELS => operation_name, OTEL_TRACES_INDEX_ID);
+    let labels = label_values!(OPERATION_INDEX_LABEL_NAMES => operation_name, OTEL_TRACES_INDEX_ID);
     counter!(parent: REQUEST_ERRORS_TOTAL, labels: [labels]).increment(1);
 
     let elapsed = request_start.elapsed().as_secs_f64();
     let err_labels = label_values!(
-        OPERATION_INDEX_ERROR_LABELS => operation_name, OTEL_TRACES_INDEX_ID, "true"
+        OPERATION_INDEX_ERROR_LABEL_NAMES => operation_name, OTEL_TRACES_INDEX_ID, "true"
     );
     histogram!(parent: REQUEST_DURATION_SECONDS, labels: [err_labels]).record(elapsed);
 }
 
 pub(crate) fn record_send(operation_name: &'static str, num_spans: usize, num_bytes: usize) {
-    let labels = label_values!(OPERATION_INDEX_LABELS => operation_name, OTEL_TRACES_INDEX_ID);
+    let labels = label_values!(OPERATION_INDEX_LABEL_NAMES => operation_name, OTEL_TRACES_INDEX_ID);
     counter!(parent: FETCHED_SPANS_TOTAL, labels: [labels]).increment(num_spans as u64);
     counter!(parent: TRANSFERRED_BYTES_TOTAL, labels: [labels]).increment(num_bytes as u64);
 }

quickwit/quickwit-jaeger/src/metrics.rs

@@ -17,8 +17,8 @@ use std::sync::LazyLock;
 use quickwit_common::metrics::exponential_buckets;
 use quickwit_metrics::{Counter, Histogram, LabelNames, counter, histogram, label_names};
 
-pub(crate) const OPERATION_INDEX_LABELS: LabelNames<2> = label_names!("operation", "index");
-pub(crate) const OPERATION_INDEX_ERROR_LABELS: LabelNames<3> =
+pub(crate) const OPERATION_INDEX_LABEL_NAMES: LabelNames<2> = label_names!("operation", "index");
+pub(crate) const OPERATION_INDEX_ERROR_LABEL_NAMES: LabelNames<3> =
     label_names!("operation", "index", "error");
 
 pub(crate) static REQUESTS_TOTAL: LazyLock<Counter> = LazyLock::new(|| {

quickwit/quickwit-jaeger/src/v1.rs

@@ -29,7 +29,7 @@ use quickwit_proto::jaeger::storage::v1::{
 use tonic::{Request, Response, Status};
 
 use crate::metrics::{
-    OPERATION_INDEX_ERROR_LABELS, OPERATION_INDEX_LABELS, REQUEST_DURATION_SECONDS,
+    OPERATION_INDEX_ERROR_LABEL_NAMES, OPERATION_INDEX_LABEL_NAMES, REQUEST_DURATION_SECONDS,
     REQUEST_ERRORS_TOTAL, REQUESTS_TOTAL,
 };
 use crate::{JaegerService, SpanStream};

quickwit/quickwit-jaeger/src/v2.rs

@@ -52,7 +52,7 @@ use tracing::field::Empty;
 use tracing::{Span as RuntimeSpan, debug, error, instrument};
 
 use crate::metrics::{
-    FETCHED_TRACES_TOTAL, OPERATION_INDEX_ERROR_LABELS, OPERATION_INDEX_LABELS,
+    FETCHED_TRACES_TOTAL, OPERATION_INDEX_ERROR_LABEL_NAMES, OPERATION_INDEX_LABEL_NAMES,
     REQUEST_DURATION_SECONDS, REQUEST_ERRORS_TOTAL, REQUESTS_TOTAL,
 };
 use crate::{
@@ -433,12 +433,12 @@ async fn stream_otel_spans_impl(
 
     record_send(operation_name, num_spans, num_bytes);
 
-    let labels = label_values!(OPERATION_INDEX_LABELS => operation_name, OTEL_TRACES_INDEX_ID);
+    let labels = label_values!(OPERATION_INDEX_LABEL_NAMES => operation_name, OTEL_TRACES_INDEX_ID);
     counter!(parent: FETCHED_TRACES_TOTAL, labels: [labels]).increment(trace_ids.len() as u64);
 
     let elapsed = request_start.elapsed().as_secs_f64();
     let err_labels = label_values!(
-        OPERATION_INDEX_ERROR_LABELS => operation_name, OTEL_TRACES_INDEX_ID, "false"
+        OPERATION_INDEX_ERROR_LABEL_NAMES => operation_name, OTEL_TRACES_INDEX_ID, "false"
     );
     histogram!(parent: REQUEST_DURATION_SECONDS, labels: [err_labels]).record(elapsed);
 

quickwit/quickwit-metrics/examples/http_service.rs

@@ -83,17 +83,17 @@ static HTTP_ACTIVE_CONNECTIONS_BY_REGION: LazyLock<Gauge> = LazyLock::new(|| {
 
 // ─── LabelNames<N> examples ───
 
-const ROUTE_LABELS: LabelNames<2> = label_names!("method", "path");
+const ROUTE_LABEL_NAMES: LabelNames<2> = label_names!("method", "path");
 
 fn record_request(method: &'static str, path: &'static str, duration: f64, size: f64) {
-    let route = label_values!(ROUTE_LABELS => method, path);
+    let route = label_values!(ROUTE_LABEL_NAMES => method, path);
     histogram!(parent: HTTP_REQUEST_DURATION, labels: [route]).record(duration);
     histogram!(parent: HTTP_RESPONSE_SIZE, labels: [route]).record(size);
     counter!(parent: HTTP_REQUESTS_TOTAL, labels: [route]).increment(1);
 }
 
 fn record_dynamic_request(method: String, path: String, duration: f64) {
-    let route = label_values!(ROUTE_LABELS => method, path);
+    let route = label_values!(ROUTE_LABEL_NAMES => method, path);
     histogram!(parent: HTTP_REQUEST_DURATION, labels: [route]).record(duration);
 }
 

quickwit/quickwit-metrics/src/labels.rs

@@ -16,14 +16,13 @@
 //!
 //! Labels can be created in two ways:
 //!
-//! - **[`labels!`]** — inline key-value pairs. Keys are always static
-//!   literals; values can be static literals (const-compatible, zero
-//!   allocation) or dynamic expressions (`Into<SharedString>`).
+//! - **[`labels!`]** — inline key-value pairs. Keys are always static literals; values can be
+//!   static literals (const-compatible, zero allocation) or dynamic expressions
+//!   (`Into<SharedString>`).
 //!
-//! - **[`label_names!`] + [`label_values!`]** — separate the label *names*
-//!   (a const [`LabelNames<N>`]) from the *values*. This avoids repeating
-//!   the same label names at every call site and lets a single
-//!   [`Labels<N>`] be shared across counter, gauge, and histogram
+//! - **[`label_names!`] + [`label_values!`]** — separate the label *names* (a const
+//!   [`LabelNames<N>`]) from the *values*. This avoids repeating the same label names at every call
+//!   site and lets a single [`Labels<N>`] be shared across counter, gauge, and histogram
 //!   extensions.
 
 use metrics::SharedString;

quickwit/quickwit-opentelemetry/src/otlp/logs.rs

@@ -41,8 +41,8 @@ use super::{
 };
 use crate::otlp::extract_attributes;
 use crate::otlp::metrics::{
-    INGESTED_BYTES_TOTAL, INGESTED_LOG_RECORDS_TOTAL, OTLP_GRPC_ERROR_LABELS, OTLP_GRPC_LABELS,
-    REQUEST_DURATION_SECONDS, REQUEST_ERRORS_TOTAL, REQUESTS_TOTAL,
+    INGESTED_BYTES_TOTAL, INGESTED_LOG_RECORDS_TOTAL, OTLP_GRPC_ERROR_LABEL_NAMES,
+    OTLP_GRPC_LABEL_NAMES, REQUEST_DURATION_SECONDS, REQUEST_ERRORS_TOTAL, REQUESTS_TOTAL,
 };
 
 pub const OTEL_LOGS_INDEX_ID: &str = "otel-logs-v0_9";
@@ -243,7 +243,7 @@ impl OtlpGrpcLogsService {
         let num_bytes = doc_batch.num_bytes() as u64;
         self.store_logs(index_id.clone(), doc_batch).await?;
 
-        let labels = label_values!(OTLP_GRPC_LABELS => "logs", index_id, "grpc", "protobuf");
+        let labels = label_values!(OTLP_GRPC_LABEL_NAMES => "logs", index_id, "grpc", "protobuf");
         counter!(parent: INGESTED_LOG_RECORDS_TOTAL, labels: [labels]).increment(num_log_records);
         counter!(parent: INGESTED_BYTES_TOTAL, labels: [labels]).increment(num_bytes);
 
@@ -317,7 +317,7 @@ impl OtlpGrpcLogsService {
         let start = std::time::Instant::now();
 
         let labels =
-            label_values!(OTLP_GRPC_LABELS => "logs", index_id.clone(), "grpc", "protobuf");
+            label_values!(OTLP_GRPC_LABEL_NAMES => "logs", index_id.clone(), "grpc", "protobuf");
         counter!(parent: REQUESTS_TOTAL, labels: [labels]).increment(1);
         let (export_res, is_error) = match self.export_inner(request, index_id.clone()).await {
             ok @ Ok(_) => (ok, "false"),
@@ -327,8 +327,7 @@ impl OtlpGrpcLogsService {
             }
         };
         let elapsed = start.elapsed().as_secs_f64();
-        let error_labels =
-            label_values!(OTLP_GRPC_ERROR_LABELS => "logs", index_id, "grpc", "protobuf", is_error);
+        let error_labels = label_values!(OTLP_GRPC_ERROR_LABEL_NAMES => "logs", index_id, "grpc", "protobuf", is_error);
         histogram!(parent: REQUEST_DURATION_SECONDS, labels: [error_labels]).record(elapsed);
 
         export_res

quickwit/quickwit-opentelemetry/src/otlp/metrics.rs

@@ -17,9 +17,9 @@ use std::sync::LazyLock;
 use quickwit_common::metrics::exponential_buckets;
 use quickwit_metrics::{Counter, Histogram, LabelNames, counter, histogram, label_names};
 
-pub(crate) const OTLP_GRPC_LABELS: LabelNames<4> =
+pub(crate) const OTLP_GRPC_LABEL_NAMES: LabelNames<4> =
     label_names!("service", "index", "transport", "format");
-pub(crate) const OTLP_GRPC_ERROR_LABELS: LabelNames<5> =
+pub(crate) const OTLP_GRPC_ERROR_LABEL_NAMES: LabelNames<5> =
     label_names!("service", "index", "transport", "format", "error");
 
 pub(crate) static REQUESTS_TOTAL: LazyLock<Counter> = LazyLock::new(|| {