addressed review comment

Author: oontvoo

lldb/include/lldb/Core/Telemetry.h

@@ -162,7 +162,8 @@ struct ExecModuleInfo : public LLDBBaseTelemetryInfo {
   UUID exec_uuid;
   /// PID of the process owned by this target.
   lldb::pid_t pid;
-  std::string arch_name;
+  /// The triple of this executable module.
+  std::string triple;
 
   /// If true, this entry was emitted at the beginning of an event (eg., before
   /// the executable is set). Otherwise, it was emitted at the end of an

lldb/include/lldb/Target/Target.h

@@ -544,8 +544,6 @@ class Target : public std::enable_shared_from_this<Target>,
     return GetStaticBroadcasterClass();
   }
 
-  UUID GetExecModuleUUID() const { return m_current_exec_mod_uuid; }
-
   // This event data class is for use by the TargetList to broadcast new target
   // notifications.
   class TargetEventData : public EventData {
@@ -1642,8 +1640,6 @@ class Target : public std::enable_shared_from_this<Target>,
 private:
   // Target metrics storage.
   TargetStats m_stats;
-  // The current executable module UUID.
-  UUID m_current_exec_mod_uuid;
 
 public:
   /// Get metrics associated with this target in JSON format.

lldb/source/Core/Telemetry.cpp

@@ -92,7 +92,7 @@ void ExecModuleInfo::serialize(Serializer &serializer) const {
 
   serializer.write("exec_uuid", exec_uuid.GetAsString());
   serializer.write("pid", pid);
-  serializer.write("arch_name", arch_name);
+  serializer.write("triple", triple);
   serializer.write("is_start_entry", is_start_entry);
 }
 

lldb/source/Target/Process.cpp

@@ -1068,14 +1068,11 @@ bool Process::SetExitStatus(int status, llvm::StringRef exit_string) {
   telemetry::ScopedDispatcher<telemetry::ProcessExitInfo> helper;
 
   // Find the executable-module's UUID, if available.
+  Target &target = GetTarget();
+  helper.SetDebugger(&(target.GetDebugger()));
   UUID exec_uuid;
-  // Check if there is (still) a valid target and get the debugger and exec_uuid
-  // from it.
-  TargetSP target_sp(Debugger::FindTargetWithProcessID(m_pid));
-  if (target_sp) {
-    helper.SetDebugger(&(target_sp->GetDebugger()));
-    exec_uuid = target_sp->GetExecModuleUUID();
-  }
+  if (ModuleSP exec_mod = target.GetExecutableModule())
+    exec_uuid = exec_mod->GetUUID();
 
   helper.DispatchNow([&](telemetry::ProcessExitInfo *info) {
     info->exec_uuid = exec_uuid;

lldb/source/Target/Target.cpp

@@ -1565,15 +1565,15 @@ void Target::SetExecutableModule(ModuleSP &executable_sp,
   ClearModules(false);
 
   if (executable_sp) {
-    m_current_exec_mod_uuid = executable_sp->GetUUID();
     lldb::pid_t pid;
     if (ProcessSP proc = GetProcessSP())
       pid = proc->GetID();
+
     helper.DispatchNow([&](telemetry::ExecModuleInfo *info) {
       info->exec_mod = executable_sp;
-      info->exec_uuid = m_current_exec_mod_uuid;
+      info->exec_uuid = executable_sp->GetUUID();
       info->pid = pid;
-      info->arch_name = executable_sp->GetArchitecture().GetArchitectureName();
+      info->triple = executable_sp->GetArchitecture().GetTriple().getTriple();
       info->is_start_entry = true;
     });