From 0270708d6d736f4376cc922b8e90e47bf37996fe Mon Sep 17 00:00:00 2001
From: Ning Sun <sunng@protonmail.com>
Date: Thu, 10 Aug 2023 11:59:41 +0800
Subject: [PATCH] fix: correct grpc metric labels (#2136)

---
 src/servers/src/grpc/handler.rs | 8 ++++----
 src/servers/src/http.rs         | 6 +++---
 src/servers/src/metrics.rs      | 3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/servers/src/grpc/handler.rs b/src/servers/src/grpc/handler.rs
index 81e12862d5..f110a0b3bc 100644
--- a/src/servers/src/grpc/handler.rs
+++ b/src/servers/src/grpc/handler.rs
@@ -36,8 +36,8 @@ use crate::error::{
 };
 use crate::grpc::TonicResult;
 use crate::metrics::{
-    METRIC_AUTH_FAILURE, METRIC_CODE_LABEL, METRIC_SERVER_GRPC_DB_REQUEST_TIMER,
-    METRIC_STATUS_LABEL, METRIC_TYPE_LABEL,
+    METRIC_AUTH_FAILURE, METRIC_CODE_LABEL, METRIC_DB_LABEL, METRIC_SERVER_GRPC_DB_REQUEST_TIMER,
+    METRIC_TYPE_LABEL,
 };
 use crate::query_handler::grpc::ServerGrpcQueryHandlerRef;
 
@@ -214,9 +214,9 @@ impl Drop for RequestTimer {
             METRIC_SERVER_GRPC_DB_REQUEST_TIMER,
             self.start.elapsed(),
             &[
-                (METRIC_CODE_LABEL, std::mem::take(&mut self.db)),
+                (METRIC_DB_LABEL, std::mem::take(&mut self.db)),
                 (METRIC_TYPE_LABEL, self.request_type.to_string()),
-                (METRIC_STATUS_LABEL, self.status_code.to_string())
+                (METRIC_CODE_LABEL, self.status_code.to_string())
             ]
         );
     }
diff --git a/src/servers/src/http.rs b/src/servers/src/http.rs
index 8f8c7b005c..af083e0767 100644
--- a/src/servers/src/http.rs
+++ b/src/servers/src/http.rs
@@ -70,8 +70,8 @@ use crate::configurator::ConfiguratorRef;
 use crate::error::{AlreadyStartedSnafu, Result, StartHttpSnafu};
 use crate::http::admin::{compact, flush};
 use crate::metrics::{
-    METRIC_HTTP_REQUESTS_ELAPSED, METRIC_HTTP_REQUESTS_TOTAL, METRIC_METHOD_LABEL,
-    METRIC_PATH_LABEL, METRIC_STATUS_LABEL,
+    METRIC_CODE_LABEL, METRIC_HTTP_REQUESTS_ELAPSED, METRIC_HTTP_REQUESTS_TOTAL,
+    METRIC_METHOD_LABEL, METRIC_PATH_LABEL,
 };
 use crate::metrics_handler::MetricsHandler;
 use crate::query_handler::grpc::ServerGrpcQueryHandlerRef;
@@ -710,7 +710,7 @@ pub(crate) async fn track_metrics<B>(req: Request<B>, next: Next<B>) -> impl Int
     let labels = [
         (METRIC_METHOD_LABEL, method.to_string()),
         (METRIC_PATH_LABEL, path),
-        (METRIC_STATUS_LABEL, status),
+        (METRIC_CODE_LABEL, status),
     ];
 
     metrics::increment_counter!(METRIC_HTTP_REQUESTS_TOTAL, &labels);
diff --git a/src/servers/src/metrics.rs b/src/servers/src/metrics.rs
index 8e206059d8..1c857f9a0a 100644
--- a/src/servers/src/metrics.rs
+++ b/src/servers/src/metrics.rs
@@ -80,7 +80,6 @@ pub(crate) const METRIC_GRPC_REQUESTS_TOTAL: &str = "servers.grpc_requests_total
 pub(crate) const METRIC_GRPC_REQUESTS_ELAPSED: &str = "servers.grpc_requests_elapsed";
 pub(crate) const METRIC_METHOD_LABEL: &str = "method";
 pub(crate) const METRIC_PATH_LABEL: &str = "path";
-pub(crate) const METRIC_STATUS_LABEL: &str = "status";
 pub(crate) const METRIC_JEMALLOC_RESIDENT: &str = "sys.jemalloc.resident";
 pub(crate) const METRIC_JEMALLOC_ALLOCATED: &str = "sys.jemalloc.allocated";
 
@@ -185,7 +184,7 @@ where
             let latency = start.elapsed().as_secs_f64();
             let status = response.status().as_u16().to_string();
 
-            let labels = [(METRIC_PATH_LABEL, path), (METRIC_STATUS_LABEL, status)];
+            let labels = [(METRIC_PATH_LABEL, path), (METRIC_CODE_LABEL, status)];
             metrics::increment_counter!(METRIC_GRPC_REQUESTS_TOTAL, &labels);
             metrics::histogram!(METRIC_GRPC_REQUESTS_ELAPSED, latency, &labels);