Update based on PR comments

Author: zhongmingyuan

devtools/etdump/tests/etdump_test.cpp

@@ -820,8 +820,10 @@ TEST_F(ProfilerETDumpTest, LogDelegateEvents) {
     const char* metadata = "test_metadata";
     etdump_gen[i]->log_profiling_delegate(
         nullptr, 278, 1, 2, metadata, strlen(metadata) + 1);
-    EventTracerEntry entry = etdump_gen[i]->start_profiling_delegate(
-        "test_event", kUnsetDelegateDebugIntId).get();
+    Result<EventTracerEntry> res = etdump_gen[i]->start_profiling_delegate(
+        "test_event", kUnsetDelegateDebugIntId);
+    ASSERT_TRUE(res.ok());
+    EventTracerEntry entry = res.get();
     EXPECT_NE(entry.delegate_event_id_type, DelegateDebugIdType::kNone);
     // Event 2
     etdump_gen[i]->end_profiling_delegate(

runtime/core/event_tracer.h

@@ -216,9 +216,13 @@ class EventTracer {
    * @param[in] delegate_debug_index The id of the delegate event. If string
    * based names are used by this delegate to identify ops executed in the
    * backend then kUnsetDebugHandle should be passed in here. 
-   * @return Returns an instance of EventTracerEntry which should be passed back
-   * into the end_profiling_dele  gate() call.
-   *         - An error code if an error occurs during logging.
+   * @return Returns an Result<EventTracerEntry> instance which may contatain
+   *  a EventTracerEntry instance. The EventTracerEntry instance should be
+   *  passed back into the end_profiling_delegate() call.
+   *         - Result<EventTracerEntry>::ok() is true if the event tracer entry
+   *           was successfully created.
+   *         - Result<EventTracerEntry>::error() is true if an error occurs
+   *           during logging.
    */
   virtual Result<EventTracerEntry> start_profiling_delegate(
       const char* name,

runtime/core/event_tracer_hooks_delegate.h

@@ -53,7 +53,10 @@ inline EventTracerEntry event_tracer_start_profiling_delegate(
     DebugHandle delegate_debug_id) {
 #ifdef ET_EVENT_TRACER_ENABLED
   if (event_tracer) {
-    return event_tracer->start_profiling_delegate(name, delegate_debug_id);
+    Result<EventTracerEntry> res = event_tracer->start_profiling_delegate(
+        name, delegate_debug_id);
+    ET_CHECK_MSG(res.ok(), "Failed to start profiling delegate event");
+    return res.get();
   }
 #else //! ET_EVENT_TRACER_ENABLED
   (void)name;
@@ -179,8 +182,9 @@ inline void event_tracer_log_output_delegate(
             std::is_same<T, executorch::aten::Tensor>::value ||
             std::is_same<T, ArrayRef<executorch::aten::Tensor>>::value,
         "Unsupported type for intermediate output");
-    event_tracer->log_intermediate_output_delegate(
+    Result<bool> res = event_tracer->log_intermediate_output_delegate(
         name, delegate_debug_id, output);
+    ET_CHECK_MSG(res.ok(), "Failed to log intermediate output delegate event");
   }
 #else //! ET_EVENT_TRACER_ENABLED
   (void)name;

runtime/core/test/event_tracer_test.cpp

@@ -109,7 +109,7 @@ class DummyEventTracer : public EventTracer {
     (void)end_time;
     (void)metadata;
     (void)metadata_len;
-    return Result<bool>(true);
+    return true;
   }
 
   virtual Result<bool> log_intermediate_output_delegate(
@@ -237,7 +237,7 @@ TEST(TestEventTracer, SimpleEventTracerTest) {
  */
 void RunSimpleTracerTestDelegate(EventTracer* event_tracer) {
   EventTracerEntry event_tracer_entry = event_tracer_start_profiling_delegate(
-      event_tracer, "test_event", kUnsetDelegateDebugIntId).get();
+      event_tracer, "test_event", kUnsetDelegateDebugIntId);
   event_tracer_end_profiling_delegate(
       event_tracer, event_tracer_entry, nullptr);
   event_tracer_start_profiling_delegate(event_tracer, nullptr, 1);