use UUID for target_uuid

Author: oontvoo

lldb/include/lldb/Core/Telemetry.h

@@ -84,16 +84,16 @@ struct ExitDescription {
 struct TargetInfo : public LLDBBaseTelemetryInfo {
   lldb::ModuleSP exec_mod;
 
-  // The same as the executable-module's UUID.
-  std::string target_uuid;
+  /// The same as the executable-module's UUID.
+  UUID target_uuid;
   std::string arch_name;
 
-  // If true, this entry was emitted at the beginning of an event (eg., before
-  // the executable laod). Otherwise, it was emitted at the end of an event
-  // (eg., after the module and any dependency were loaded.)
+  /// If true, this entry was emitted at the beginning of an event (eg., before
+  /// the executable is loaded). Otherwise, it was emitted at the end of an
+  /// event (eg., after the module and any dependency were loaded.)
   bool is_start_entry;
 
-  // Describes the exit of the executable module.
+  /// Describes the exit of the executable module.
   std::optional<ExitDescription> exit_desc;
   TargetInfo() = default;
 

lldb/source/Core/Telemetry.cpp

@@ -71,7 +71,7 @@ void DebuggerInfo::serialize(Serializer &serializer) const {
 void TargetInfo::serialize(Serializer &serializer) const {
   LLDBBaseTelemetryInfo::serialize(serializer);
 
-  serializer.write("target_uuid", target_uuid);
+  serializer.write("target_uuid", target_uuid.GetAsString());
   serializer.write("arch_name", arch_name);
   serializer.write("is_start_entry", is_start_entry);
   if (exit_desc.has_value()) {

lldb/source/Target/Process.cpp

@@ -1068,8 +1068,7 @@ bool Process::SetExitStatus(int status, llvm::StringRef exit_string) {
   Debugger *debugger = &(GetTarget().GetDebugger());
   telemetry::ScopedDispatcher<telemetry::TargetInfo> helper(debugger);
   // Save the Module UUID since the Module might be gone by end of scope.
-  std::string target_uuid =
-      GetTarget().GetExecutableModule()->GetUUID().GetAsString();
+  UUID target_uuid = GetTarget().GetExecutableModule()->GetUUID();
 
   helper.DispatchNow([&](telemetry::TargetInfo *info) {
     info->target_uuid = target_uuid;

lldb/source/Target/Target.cpp

@@ -1567,14 +1567,14 @@ void Target::SetExecutableModule(ModuleSP &executable_sp,
   if (executable_sp) {
     helper.DispatchNow([&](telemetry::TargetInfo *info) {
       info->exec_mod = executable_sp;
-      info->target_uuid = executable_sp->GetUUID().GetAsString();
+      info->target_uuid = executable_sp->GetUUID();
       info->arch_name = executable_sp->GetArchitecture().GetArchitectureName();
       info->is_start_entry = true;
     });
 
     helper.DispatchOnExit([&](telemetry::TargetInfo *info) {
       info->exec_mod = executable_sp;
-      info->target_uuid = executable_sp->GetUUID().GetAsString();
+      info->target_uuid = executable_sp->GetUUID();
     });
 
     ElapsedTime elapsed(m_stats.GetCreateTime());