renaming for clarity

Author: oontvoo

lldb/include/lldb/Core/Telemetry.h

@@ -189,8 +189,8 @@ template <typename Info> struct ScopedDispatcher {
   }
 
   void DispatchNow(llvm::unique_function<void(Info *info)> populate_fields_cb) {
-    TelemetryManager *manager = TelemetryManager::GetInstanceIfEnabled();
-    if (!manager)
+    TelemetryManager *manager = TelemetryManager::GetInstance();
+    if (!manager->GetConfig()->EnableTelemetry)
       return;
     Info info;
     // Populate the common fields we know aboutl
@@ -204,7 +204,6 @@ template <typename Info> struct ScopedDispatcher {
       LLDB_LOG_ERROR(GetLog(LLDBLog::Object), std::move(er),
                      "Failed to dispatch entry of type: {0}", m_info.getKind());
     }
-
   }
 
   ~ScopedDispatcher() {

lldb/source/Core/Telemetry.cpp

@@ -65,6 +65,8 @@ void CommandInfo::serialize(Serializer &serializer) const {
   serializer.write("target_uuid", target_uuid);
   serializer.write("command_id", command_id);
   serializer.write("command_name", command_name);
+  serializer.write("original_command", original_command);
+  serializer.write("args", args);
   serializer.write("ret_status", ret_status);
   serializer.write("error_data", error_data);
 }

lldb/source/Interpreter/CommandInterpreter.cpp

@@ -1887,7 +1887,8 @@ bool CommandInterpreter::HandleCommand(const char *command_line,
                                        bool force_repeat_command) {
   lldb_private::telemetry::ScopedDispatcher<
       lldb_private::telemetry:CommandInfo> helper(m_debugger);
-  lldb_private::telemetry::TelemetryManager *ins = lldb_private::telemetry::TelemetryManager::GetInstance();
+  lldb_private::telemetry::TelemetryManager *ins =
+      lldb_private::telemetry::TelemetryManager::GetInstance();
   const int command_id = ins->MakeNextCommandId();
 
   std::string command_string(command_line);
@@ -1896,7 +1897,7 @@ bool CommandInterpreter::HandleCommand(const char *command_line,
   std::string parsed_command_args;
   CommandObject *cmd_obj = nullptr;
 
-  helper.DispatchNow([&](lldb_private::telemetry:CommandInfo* info){
+  helper.DispatchNow([&](lldb_private::telemetry : CommandInfo *info) {
     info.command_id = command_id;
     if (Target* target = GetExecutionContext().GetTargetPtr()) {
       // If we have a target attached to this command, then get the UUID.
@@ -1910,7 +1911,7 @@ bool CommandInterpreter::HandleCommand(const char *command_line,
     // Those will be collected by the on-exit-callback.
   });
 
-  helper.DispatchOnExit([&](lldb_private::telemetry:CommandInfo* info) {
+  helper.DispatchOnExit([&](lldb_private::telemetry : CommandInfo *info) {
     // TODO: this is logging the time the command-handler finishes.
     // But we may want a finer-grain durations too?
     // (ie., the execute_time recorded below?)