move grpc enablement to gcs only

Signed-off-by: Ruiyang Wang <rywang014@gmail.com>
ray-project · Sep 6, 2023 · c58aab2 · c58aab2
1 parent fb6e0aa
commit c58aab2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -585,6 +585,7 @@ cc_binary(
         ":gcs_server_lib",
         ":stats_lib",
         "@com_github_gflags_gflags//:gflags",
+        "@com_github_grpc_grpc//:grpc_opencensus_plugin",
     ] + malloc_deps,
 )
 
@@ -624,10 +625,8 @@ cc_library(
     strip_include_prefix = "src",
     visibility = ["//visibility:public"],
     deps = [
-        "//src/ray/common:ray_config",
         "//src/ray/util",
         "@com_github_jupp0r_prometheus_cpp//pull",
-        "@com_github_grpc_grpc//:grpc_opencensus_plugin",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/memory",

diff --git a/src/ray/common/ray_config_def.h b/src/ray/common/ray_config_def.h
@@ -516,6 +516,7 @@ RAY_CONFIG(bool, enable_metrics_collection, true)
 /// Whether or not we enable gRPC metrics collection.
 /// Note: this field is used at program start time and cannot be switched by config
 /// changes. If you want to reset this value, re-start your program.
+/// TODO: it only works for gcs now.
 RAY_CONFIG(bool, enable_grpc_metrics_collection, false)
 
 // Max number bytes of inlined objects in a task rpc request/response.

diff --git a/src/ray/gcs/gcs_server/gcs_server_main.cc b/src/ray/gcs/gcs_server/gcs_server_main.cc
@@ -15,6 +15,7 @@
 #include <iostream>
 
 #include "gflags/gflags.h"
+#include "grpcpp/opencensus.h"
 #include "ray/common/ray_config.h"
 #include "ray/gcs/gcs_server/gcs_server.h"
 #include "ray/gcs/store_client/redis_store_client.h"
@@ -69,6 +70,11 @@ int main(int argc, char *argv[]) {
   // as soon as there is no more work to be processed.
   boost::asio::io_service::work work(main_service);
 
+  if (RayConfig::instance().enable_grpc_metrics_collection()) {
+    grpc::RegisterOpenCensusPlugin();
+    grpc::RegisterOpenCensusViewsForExport();
+  }
+
   const ray::stats::TagsType global_tags = {{ray::stats::ComponentKey, "gcs_server"},
                                             {ray::stats::WorkerIdKey, ""},
                                             {ray::stats::VersionKey, kRayVersion},

diff --git a/src/ray/stats/metric.cc b/src/ray/stats/metric.cc
@@ -14,11 +14,9 @@
 
 #include "ray/stats/metric.h"
 
-#include "grpcpp/opencensus.h"
 #include "opencensus/stats/internal/aggregation_window.h"
 #include "opencensus/stats/internal/set_aggregation_window.h"
 #include "opencensus/stats/measure_registry.h"
-#include "ray/common/ray_config.h"
 
 namespace ray {
 
@@ -43,17 +41,6 @@ void RegisterAsView(opencensus::stats::ViewDescriptor view_descriptor,
   view_descriptor.RegisterForExport();
 }
 
-inline const static bool _static_init_grpc_metrics_collection_enabled = []() -> bool {
-  if (RayConfig::instance().enable_grpc_metrics_collection()) {
-    RAY_LOG(INFO) << "enabled grpc metrics collection";
-    grpc::RegisterOpenCensusPlugin();
-    grpc::RegisterOpenCensusViewsForExport();
-    return true;
-  }
-  RAY_LOG(INFO) << "disabled grpc metrics collection";
-  return false;
-}();
-
 }  // namespace internal
 ///
 /// Stats Config