formatting + renaming

Author: oontvoo

lldb/include/lldb/Core/Telemetry.h

@@ -91,20 +91,16 @@ struct CommandInfo : public LLDBBaseTelemetryInfo {
   // and another right after. This is to avoid losing telemetry if the command
   // does not execute successfully.
   int command_id;
-
   // Eg., "breakpoint set"
   std::string command_name;
-
   // !!NOTE!! These two fields are not collected by default due to PII risks.
   // Vendor may allow them by setting the LLDBConfig::m_detailed_command_telemetry.
   std::string original_command;
   std::string args;
-
   // Return status of a command and any error description in case of error.
   lldb::ReturnStatus ret_status;
   std::string error_data;
 
-
   CommandInfo() = default;
 
   llvm::telemetry::KindType getKind() const override { return LLDBEntryKind::CommandInfo; }
@@ -115,7 +111,7 @@ struct CommandInfo : public LLDBBaseTelemetryInfo {
 
   void serialize(Serializer &serializer) const override;
  };
-  
+
 struct DebuggerInfo : public LLDBBaseTelemetryInfo {
   std::string lldb_version;
 
@@ -188,11 +184,11 @@ template <typename Info> struct ScopedDispatcher {
 
   void SetDebugger(Debugger *debugger) { debugger = debugger; }
 
-  void SetFinalCallback(llvm::unique_function<void(Info *info)> final_callback) {
+  void DispatchOnExit(llvm::unique_function<void(Info *info)> final_callback) {
     m_final_callback(std::move(final_callback));
   }
 
-  void DispatchNowIfEnable(llvm::unique_function<void(Info *info)> populate_fields_cb) {
+  void DispatchNow(llvm::unique_function<void(Info *info)> populate_fields_cb) {
     TelemetryManager *manager = TelemetryManager::GetInstanceIfEnabled();
     if (!manager)
       return;

lldb/source/Interpreter/CommandInterpreter.cpp

@@ -1887,17 +1887,16 @@ 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::GetInstanceOrDummy();
+  lldb_private::telemetry::TelemetryManager *ins = lldb_private::telemetry::TelemetryManager::GetInstance();
   const int command_id = ins->MakeNextCommandId();
 
-
   std::string command_string(command_line);
   std::string original_command_string(command_string);
   std::string real_original_command_string(command_string);
   std::string parsed_command_args;
   CommandObject *cmd_obj = nullptr;
 
-  helper.DispatchIfEnable([&](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.
@@ -1915,7 +1914,6 @@ bool CommandInterpreter::HandleCommand(const char *command_line,
     // 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?)
-
     info.command_id = command_id;
     llvm::StringRef command_name =
         cmd_obj ? cmd_obj->GetCommandName() : "<not found>";