[core] Delete event_label (ray-project#54378)

event_label is just macros mapping to strings that are only used in one
spot. There really isn't a need for this, string literals are compile
time constants anyways.

Signed-off-by: dayshah <dhyey2019@gmail.com>

Author: dayshah

cpp/src/ray/runtime/task/task_executor.cc

@@ -21,7 +21,6 @@
 #include "../../util/function_helper.h"
 #include "../abstract_ray_runtime.h"
 #include "ray/util/event.h"
-#include "ray/util/event_label.h"
 
 namespace ray {
 
@@ -211,7 +210,7 @@ Status TaskExecutor::ExecuteTask(
     if (status.IsIntentionalSystemExit()) {
       return status;
     } else {
-      RAY_EVENT(ERROR, EL_RAY_CPP_TASK_FAILED)
+      RAY_EVENT(ERROR, "RAY_CPP_TASK_FAILED")
               .WithField("task_type", TaskType_Name(task_type))
               .WithField("function_name", func_name)
           << "C++ task failed: " << status.ToString();

src/ray/common/file_system_monitor.h

@@ -25,7 +25,6 @@
 #include "ray/common/asio/instrumented_io_context.h"
 #include "ray/common/asio/periodical_runner.h"
 #include "ray/util/event.h"
-#include "ray/util/event_label.h"
 
 namespace ray {
 /// Monitor the filesystem capacity ray is using.

src/ray/core_worker/transport/task_receiver.cc

@@ -269,7 +269,6 @@ bool TaskReceiver::CancelQueuedNormalTask(TaskID task_id) {
   return normal_scheduling_queue_->CancelTaskIfFound(task_id);
 }
 
-/// Note that this method is only used for asyncio actor.
 void TaskReceiver::SetupActor(bool is_asyncio,
                               int fiber_max_concurrency,
                               bool execute_out_of_order) {

src/ray/gcs/gcs_server/gcs_node_manager.cc

@@ -25,7 +25,6 @@
 #include "ray/gcs/pb_util.h"
 #include "ray/stats/stats.h"
 #include "ray/util/event.h"
-#include "ray/util/event_label.h"
 #include "ray/util/logging.h"
 #include "src/ray/protobuf/gcs.pb.h"
 
@@ -408,7 +407,7 @@ std::shared_ptr<rpc::GcsNodeInfo> GcsNodeManager::RemoveNode(
           << " has missed too many heartbeats from it. This can happen when a "
              "\t(1) raylet crashes unexpectedly (OOM, etc.) \n"
           << "\t(2) raylet has lagging heartbeats due to slow network or busy workload.";
-      RAY_EVENT(ERROR, EL_RAY_NODE_REMOVED)
+      RAY_EVENT(ERROR, "RAY_NODE_REMOVED")
               .WithField("node_id", node_id.Hex())
               .WithField("ip", removed_node->node_manager_address())
           << error_message.str();

src/ray/raylet/node_manager.cc

@@ -50,7 +50,6 @@
 #include "ray/stats/metric_defs.h"
 #include "ray/util/cmd_line_utils.h"
 #include "ray/util/event.h"
-#include "ray/util/event_label.h"
 #include "ray/util/util.h"
 
 namespace {
@@ -1455,7 +1454,7 @@ void NodeManager::DisconnectClient(const std::shared_ptr<ClientConnection> &clie
                       << rpc::WorkerExitType_Name(disconnect_type)
                       << " Worker exit detail: " << disconnect_detail;
         std::string error_message_str = error_message.str();
-        RAY_EVENT(ERROR, EL_RAY_WORKER_FAILURE)
+        RAY_EVENT(ERROR, "RAY_WORKER_FAILURE")
                 .WithField("worker_id", worker->WorkerId().Hex())
                 .WithField("node_id", self_node_id_.Hex())
                 .WithField("job_id", worker->GetAssignedJobId().Hex())
@@ -1484,7 +1483,7 @@ void NodeManager::DisconnectClient(const std::shared_ptr<ClientConnection> &clie
     RAY_LOG(INFO).WithField(worker->WorkerId()).WithField(worker->GetAssignedJobId())
         << "Driver (pid=" << worker->GetProcess().GetId() << ") is disconnected.";
     if (disconnect_type == rpc::WorkerExitType::SYSTEM_ERROR) {
-      RAY_EVENT(ERROR, EL_RAY_DRIVER_FAILURE)
+      RAY_EVENT(ERROR, "RAY_DRIVER_FAILURE")
               .WithField("node_id", self_node_id_.Hex())
               .WithField("job_id", worker->GetAssignedJobId().Hex())
           << "Driver " << worker->WorkerId() << " died. Address: " << worker->IpAddress()

src/ray/util/BUILD

@@ -10,11 +10,6 @@ ray_cc_library(
     hdrs = ["macros.h"],
 )
 
-ray_cc_library(
-    name = "event_label",
-    hdrs = ["event_label.h"],
-)
-
 ray_cc_library(
     name = "array",
     hdrs = ["array.h"],
@@ -52,7 +47,6 @@ ray_cc_library(
     srcs = ["logging.cc"],
     hdrs = ["logging.h"],
     deps = [
-        ":event_label",
         ":macros",
         ":string_utils",
         ":thread_utils",

src/ray/util/event_label.h

@@ -44,7 +44,6 @@
 #include "absl/debugging/symbolize.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_format.h"
-#include "ray/util/event_label.h"
 #include "ray/util/string_utils.h"
 #include "ray/util/thread_utils.h"
 #include "spdlog/sinks/basic_file_sink.h"
@@ -592,7 +591,7 @@ RayLog::~RayLog() {
     msg_osstream_ << "\n*** StackTrace Information ***\n" << ray::StackTrace();
     expose_fatal_osstream_ << "\n*** StackTrace Information ***\n" << ray::StackTrace();
     for (const auto &callback : fatal_log_callbacks_) {
-      callback(EL_RAY_FATAL_CHECK_FAILED, expose_fatal_osstream_.str());
+      callback("RAY_FATAL_CHECK_FAILED", expose_fatal_osstream_.str());
     }
   }
 

src/ray/util/logging.cc

@@ -29,7 +29,6 @@
 #include <vector>
 
 #include "ray/common/ray_config.h"
-#include "ray/util/event_label.h"
 #include "ray/util/random.h"
 #include "ray/util/string_utils.h"
 #include "src/ray/protobuf/gcs.pb.h"
@@ -592,7 +591,7 @@ TEST_F(EventTest, TestRayCheckAbort) {
                    "task 1",
                    "RAYLET",
                    "FATAL",
-                   EL_RAY_FATAL_CHECK_FAILED,
+                   "RAY_FATAL_CHECK_FAILED",
                    "NULL");
   EXPECT_THAT(ele_1.message(),
               testing::HasSubstr("Check failed: 1 < 0 incorrect test case"));