migrate stats for rpc component

Signed-off-by: Cuong Nguyen <[email protected]>

Author: can-anyscale

src/ray/rpc/client_call.h

@@ -104,7 +104,8 @@ class ClientCallImpl : public ClientCall {
       status = return_status_;
     }
     if (record_stats_ && !status.ok()) {
-      grpc_client_req_failed_metric_.Record(1.0, {{"Method", stats_handle_->event_name}});
+      grpc_client_req_failed_counter_.Record(1.0,
+                                             {{"Method", stats_handle_->event_name}});
     }
     if (callback_ != nullptr) {
       // This should be only called once.
@@ -146,7 +147,8 @@ class ClientCallImpl : public ClientCall {
   /// the server and/or tweak certain RPC behaviors.
   grpc::ClientContext context_;
 
-  ray::stats::Count grpc_client_req_failed_metric_{GetGrpcClientReqFailedMetric()};
+  ray::stats::Count grpc_client_req_failed_counter_{
+      GetGrpcClientReqFailedCounterMetric()};
 
   friend class ClientCallManager;
 };

src/ray/rpc/metrics.h

@@ -19,7 +19,7 @@
 namespace ray {
 namespace rpc {
 
-inline ray::stats::Histogram GetGrpcServerReqProcessTimeMsMetric() {
+inline ray::stats::Histogram GetGrpcServerReqProcessTimeMsHistogramMetric() {
   return ray::stats::Histogram(
       /*name=*/"grpc_server_req_process_time_ms",
       /*description=*/"Request latency in grpc server",
@@ -28,47 +28,47 @@ inline ray::stats::Histogram GetGrpcServerReqProcessTimeMsMetric() {
       /*tag_keys=*/{"Method"});
 }
 
-inline ray::stats::Count GetGrpcServerReqNewMetric() {
+inline ray::stats::Count GetGrpcServerReqNewCounterMetric() {
   return ray::stats::Count(
       /*name=*/"grpc_server_req_new",
       /*description=*/"New request number in grpc server",
       /*unit=*/"",
       /*tag_keys=*/{"Method"});
 }
 
-inline ray::stats::Count GetGrpcServerReqHandlingMetric() {
+inline ray::stats::Count GetGrpcServerReqHandlingCounterMetric() {
   return ray::stats::Count(
       /*name=*/"grpc_server_req_handling",
       /*description=*/"Request number are handling in grpc server",
       /*unit=*/"",
       /*tag_keys=*/{"Method"});
 }
 
-inline ray::stats::Count GetGrpcServerReqFinishedMetric() {
+inline ray::stats::Count GetGrpcServerReqFinishedCounterMetric() {
   return ray::stats::Count(
       /*name=*/"grpc_server_req_finished",
       /*description=*/"Finished request number in grpc server",
       /*unit=*/"",
       /*tag_keys=*/{"Method"});
 }
 
-inline ray::stats::Count GetGrpcServerReqSucceededMetric() {
+inline ray::stats::Count GetGrpcServerReqSucceededCounterMetric() {
   return ray::stats::Count(
       /*name=*/"grpc_server_req_succeeded",
       /*description=*/"Succeeded request count in grpc server",
       /*unit=*/"",
       /*tag_keys=*/{"Method"});
 }
 
-inline ray::stats::Count GetGrpcServerReqFailedMetric() {
+inline ray::stats::Count GetGrpcServerReqFailedCounterMetric() {
   return ray::stats::Count(
       /*name=*/"grpc_server_req_failed",
       /*description=*/"Failed request count in grpc server",
       /*unit=*/"",
       /*tag_keys=*/{"Method"});
 }
 
-inline ray::stats::Count GetGrpcClientReqFailedMetric() {
+inline ray::stats::Count GetGrpcClientReqFailedCounterMetric() {
   return ray::stats::Count(
       /*name=*/"grpc_client_req_failed",
       /*description=*/"Number of gRPC client failures (non-OK response statuses).",

src/ray/rpc/server_call.h

@@ -185,7 +185,7 @@ class ServerCallImpl : public ServerCall {
     // TODO(Yi Cheng) call_name_ sometimes get corrunpted due to memory issues.
     RAY_CHECK(!call_name_.empty()) << "Call name is empty";
     if (record_metrics_) {
-      grpc_server_req_new_metric_.Record(1.0, {{"Method", call_name_}});
+      grpc_server_req_new_counter_.Record(1.0, {{"Method", call_name_}});
     }
   }
 
@@ -218,7 +218,7 @@ class ServerCallImpl : public ServerCall {
 
     start_time_ = absl::GetCurrentTimeNanos();
     if (record_metrics_) {
-      grpc_server_req_handling_metric_.Record(1.0, {{"Method", call_name_}});
+      grpc_server_req_handling_counter_.Record(1.0, {{"Method", call_name_}});
     }
     if (!io_service_.stopped()) {
       io_service_.post([this, auth_success] { HandleRequestImpl(auth_success); },
@@ -279,8 +279,8 @@ class ServerCallImpl : public ServerCall {
 
   void OnReplySent() override {
     if (record_metrics_) {
-      grpc_server_req_finished_metric_.Record(1.0, {{"Method", call_name_}});
-      grpc_server_req_succeeded_metric_.Record(1.0, {{"Method", call_name_}});
+      grpc_server_req_finished_counter_.Record(1.0, {{"Method", call_name_}});
+      grpc_server_req_succeeded_counter_.Record(1.0, {{"Method", call_name_}});
     }
     if (send_reply_success_callback_ && !io_service_.stopped()) {
       io_service_.post(
@@ -292,8 +292,8 @@ class ServerCallImpl : public ServerCall {
 
   void OnReplyFailed() override {
     if (record_metrics_) {
-      grpc_server_req_finished_metric_.Record(1.0, {{"Method", call_name_}});
-      grpc_server_req_failed_metric_.Record(1.0, {{"Method", call_name_}});
+      grpc_server_req_finished_counter_.Record(1.0, {{"Method", call_name_}});
+      grpc_server_req_failed_counter_.Record(1.0, {{"Method", call_name_}});
     }
     if (send_reply_failure_callback_ && !io_service_.stopped()) {
       io_service_.post(
@@ -311,8 +311,8 @@ class ServerCallImpl : public ServerCall {
     EventTracker::RecordEnd(std::move(stats_handle_));
     auto end_time = absl::GetCurrentTimeNanos();
     if (record_metrics_) {
-      grpc_server_req_process_time_ms_metric_.Record((end_time - start_time_) / 1000000.0,
-                                                     {{"Method", call_name_}});
+      grpc_server_req_process_time_ms_histogram_.Record(
+          (end_time - start_time_) / 1000000.0, {{"Method", call_name_}});
     }
   }
 
@@ -385,17 +385,17 @@ class ServerCallImpl : public ServerCall {
   /// If true, the server call will generate gRPC server metrics.
   bool record_metrics_;
 
-  ray::stats::Histogram grpc_server_req_process_time_ms_metric_{
-      GetGrpcServerReqProcessTimeMsMetric()};
-  ray::stats::Count grpc_server_req_new_metric_{GetGrpcServerReqNewMetric()};
-  ray::stats::Count grpc_server_req_handling_metric_{
-      GetGrpcServerReqHandlingMetric()};
-  ray::stats::Count grpc_server_req_finished_metric_{
-      GetGrpcServerReqFinishedMetric()};
-  ray::stats::Count grpc_server_req_succeeded_metric_{
-      GetGrpcServerReqSucceededMetric()};
-  ray::stats::Count grpc_server_req_failed_metric_{
-      GetGrpcServerReqFailedMetric()};
+  ray::stats::Histogram grpc_server_req_process_time_ms_histogram_{
+      GetGrpcServerReqProcessTimeMsHistogramMetric()};
+  ray::stats::Count grpc_server_req_new_counter_{GetGrpcServerReqNewCounterMetric()};
+  ray::stats::Count grpc_server_req_handling_counter_{
+      GetGrpcServerReqHandlingCounterMetric()};
+  ray::stats::Count grpc_server_req_finished_counter_{
+      GetGrpcServerReqFinishedCounterMetric()};
+  ray::stats::Count grpc_server_req_succeeded_counter_{
+      GetGrpcServerReqSucceededCounterMetric()};
+  ray::stats::Count grpc_server_req_failed_counter_{
+      GetGrpcServerReqFailedCounterMetric()};
 
   template <class T1, class T2, class T3, class T4, AuthType T5>
   friend class ServerCallFactoryImpl;