fixed test

Author: oontvoo

lldb/include/lldb/Core/Telemetry.h

@@ -161,7 +161,7 @@ class TelemetryManager : public llvm::telemetry::Manager {
   // "start" and "end" entries can be matched up.
   // These values don't need to be unique across runs (because they are
   // secondary-key), hence a simple counter is sufficent.
-  std::atomic<int> command_id_seed = 0;
+  std::atomic<int> m_command_id_seed = 0;
   static std::unique_ptr<TelemetryManager> g_instance;
 };
 

lldb/source/Core/Telemetry.cpp

@@ -60,7 +60,7 @@ void LLDBBaseTelemetryInfo::serialize(Serializer &serializer) const {
     serializer.write("end_time", ToNanosec(end_time.value()));
 }
 void CommandInfo::serialize(Serializer &serializer) const {
-  LLDBBaseTelemetryInfo::serializer(serializer);
+  LLDBBaseTelemetryInfo::serialize(serializer);
 
   serializer.write("target_uuid", target_uuid);
   serializer.write("command_id", command_id);
@@ -78,7 +78,7 @@ void DebuggerInfo::serialize(Serializer &serializer) const {
   serializer.write("is_exit_entry", is_exit_entry);
 }
 
-TelemetryManager::TelemetryManager(std::unique_ptr<Config> config)
+TelemetryManager::TelemetryManager(std::unique_ptr<LLDBConfig> config)
     : m_config(std::move(config)), m_id(MakeUUID()) {}
 
 llvm::Error TelemetryManager::preDispatch(TelemetryInfo *entry) {
@@ -94,18 +94,20 @@ int TelemetryManager::MakeNextCommandId() {
   return m_command_id_seed.fetch_add(1);
 }
 
-const LLDBConfig *TelemetryManager::GetConfig() { return m_config.get(); }
-
-class NoOpTelemetryManager : final public TelemetryManager {
- public:
+class NoOpTelemetryManager : public TelemetryManager {
+public:
   llvm::Error preDispatch(llvm::telemetry::TelemetryInfo *entry) override {
     // Does nothing.
     return llvm::Error::success();
   }
 
-  explicit NoOpTelemetryManager() : TelemetryManager(std::make_unique<LLDBConfig(/*EnableTelemetry*/false, /*DetailedCommand*/false)>) {}
+  explicit NoOpTelemetryManager()
+      : TelemetryManager(std::make_unique<LLDBConfig>(
+            /*EnableTelemetry*/ false, /*DetailedCommand*/ false)) {}
 
-  virtual llvm::StringRef GetInstanceName() const  { return "NoOpTelemetryManager"; }
+  virtual llvm::StringRef GetInstanceName() const override {
+    return "NoOpTelemetryManager";
+  }
 
   llvm::Error dispatch(llvm::telemetry::TelemetryInfo *entry) override {
     // Does nothing.

lldb/source/Interpreter/CommandInterpreter.cpp

@@ -46,6 +46,7 @@
 #include "Commands/CommandObjectWatchpoint.h"
 
 #include "lldb/Core/Debugger.h"
+#include "lldb/Core/Module.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/Telemetry.h"
 #include "lldb/Host/StreamFile.h"
@@ -1887,7 +1888,7 @@ bool CommandInterpreter::HandleCommand(const char *command_line,
                                        bool force_repeat_command) {
   lldb_private::telemetry::ScopedDispatcher<
       lldb_private::telemetry::CommandInfo>
-      helper(m_debugger);
+      helper(&m_debugger);
   lldb_private::telemetry::TelemetryManager *ins =
       lldb_private::telemetry::TelemetryManager::GetInstance();
   const int command_id = ins->MakeNextCommandId();
@@ -1922,9 +1923,8 @@ bool CommandInterpreter::HandleCommand(const char *command_line,
         cmd_obj ? cmd_obj->GetCommandName() : "<not found>";
     info->command_name = command_name.str();
     info->ret_status = result.GetStatus();
-    if (llvm::StringRef error_data = result.GetErrorData();
-      !error_data.empty())
-      info->error_data = error_data.str();
+    if (std::string error_str = result.GetErrorString(); !error_str.empty())
+      info->error_data = std::move(error_str);
 
     if (ins->GetConfig()->m_detailed_command_telemetry)
       info->args = parsed_command_args;

lldb/unittests/Core/TelemetryTest.cpp

@@ -52,7 +52,7 @@ class FakePlugin : public telemetry::TelemetryManager {
 public:
   FakePlugin()
       : telemetry::TelemetryManager(
-            std::make_unique<llvm::telemetry::Config>(true)) {}
+            std::make_unique<telemetry::LLDBConfig>(true, true)) {}
 
   // TelemetryManager interface
   llvm::Error preDispatch(llvm::telemetry::TelemetryInfo *entry) override {