change the data type from json to structureddata

Author: oontvoo

lldb/include/lldb/API/SBDebugger.h

@@ -14,7 +14,6 @@
 #include "lldb/API/SBDefines.h"
 #include "lldb/API/SBPlatform.h"
 #include "lldb/API/SBStructuredData.h"
-#include "llvm/Support/JSON.h"
 
 namespace lldb_private {
 class CommandPluginInterfaceImplementation;
@@ -247,7 +246,7 @@ class LLDB_API SBDebugger {
 
   lldb::SBTarget GetDummyTarget();
 
-  void SendTelemetry(const llvm::json::Object &entry);
+  void SendTelemetry(const lldb::SBStructuredData &entry);
 
   // Return true if target is deleted from the target list of the debugger.
   bool DeleteTarget(lldb::SBTarget &target);

lldb/include/lldb/Core/Debugger.h

@@ -19,6 +19,7 @@
 #include "lldb/Core/FormatEntity.h"
 #include "lldb/Core/IOHandler.h"
 #include "lldb/Core/SourceManager.h"
+#include "lldb/Core/StructuredDataImpl.h"
 #include "lldb/Core/Telemetry.h"
 #include "lldb/Core/UserSettingsController.h"
 #include "lldb/Host/HostThread.h"
@@ -47,7 +48,6 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/DynamicLibrary.h"
 #include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/JSON.h"
 #include "llvm/Support/Threading.h"
 #include "llvm/Telemetry/Telemetry.h"
 
@@ -155,7 +155,7 @@ class Debugger : public std::enable_shared_from_this<Debugger>,
 
   LldbTelemeter *GetTelemeter() { return m_telemeter.get(); }
 
-  void SendClientTelemetry(const llvm::json::Object &entry);
+  void SendClientTelemetry(const lldb_private::StructuredDataImpl &entry);
 
   Status SetInputString(const char *data);
 

lldb/include/lldb/Core/Telemetry.h

@@ -17,6 +17,7 @@
 #include <string>
 #include <unordered_map>
 
+#include "lldb/Core/StructuredDataImpl.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Utility/StructuredData.h"
 #include "lldb/lldb-forward.h"
@@ -258,7 +259,8 @@ class LldbTelemeter : public llvm::telemetry::Telemeter {
   virtual std::string GetNextUUID() = 0;
 
   // For client (eg., SB API) to send telemetry entries.
-  virtual void LogClientTelemetry(const llvm::json::Object &entry) = 0;
+  virtual void
+  LogClientTelemetry(const lldb_private::StructuredDataImpl &entry) = 0;
 };
 
 // Logger configs: LLDB users can also supply their own configs via:

lldb/source/API/SBDebugger.cpp

@@ -972,9 +972,9 @@ SBTarget SBDebugger::GetDummyTarget() {
   return sb_target;
 }
 
-void SBDebugger::SendTelemetry(const llvm::json::Object &entry) {
+void SBDebugger::SendTelemetry(const lldb::SBStructuredData &entry) {
   if (lldb_private::Debugger *debugger = this->get()) {
-    debugger->SendClientTelemetry(entry);
+    debugger->SendClientTelemetry(*(entry.m_impl_up.get()));
   } else {
     Log *log = GetLog(LLDBLog::API);
     LLDB_LOGF(log,

lldb/source/Core/Debugger.cpp

@@ -2256,6 +2256,7 @@ llvm::ThreadPoolInterface &Debugger::GetThreadPool() {
   return *g_thread_pool;
 }
 
-void Debugger::SendClientTelemetry(const llvm::json::Object &entry) {
+void Debugger::SendClientTelemetry(
+    const lldb_private::StructuredDataImpl &entry) {
   m_telemeter->LogClientTelemetry(entry);
 }

lldb/source/Core/Telemetry.cpp

@@ -332,7 +332,8 @@ class NoOpTelemeter : public LldbTelemeter {
                      Target *target_ptr, CommandReturnObject *result) override {
   }
 
-  void LogClientTelemetry(const llvm::json::Object &entry) override {}
+  void
+  LogClientTelemetry(const lldb_private::StructuredDataImpl &entry) override {}
 
   void addDestination(llvm::telemetry::Destination *destination) override {}
   std::string GetNextUUID() override { return ""; }
@@ -360,7 +361,8 @@ class BasicTelemeter : public LldbTelemeter {
                      llvm::StringRef command_args, EventStats stats,
                      Target *target_ptr, CommandReturnObject *result) override;
 
-  void LogClientTelemetry(const llvm::json::Object &entry) override;
+  void
+  LogClientTelemetry(const lldb_private::StructuredDataImpl &entry) override;
 
   void addDestination(Destination *destination) override {
     m_destinations.push_back(destination);
@@ -563,9 +565,11 @@ void BasicTelemeter::LogMainExecutableLoadEnd(lldb::ModuleSP exec_mod,
   EmitToDestinations(&misc_info);
 }
 
-void BasicTelemeter::LogClientTelemetry(const llvm::json::Object &entry) {
+void BasicTelemeter::LogClientTelemetry(
+    const lldb_private::StructuredDataImpl &entry) {
+  // TODO: pull the dictionary out of entry
   ClientTelemetryInfo client_info = MakeBaseEntry<ClientTelemetryInfo>();
-
+  /*
   std::optional<llvm::StringRef> request_name = entry.getString("request_name");
   if (!request_name.has_value()) {
     MiscTelemetryInfo misc_info = MakeBaseEntry<MiscTelemetryInfo>();
@@ -597,6 +601,7 @@ void BasicTelemeter::LogClientTelemetry(const llvm::json::Object &entry) {
   std::optional<llvm::StringRef> error_msg = entry.getString("error");
   if (error_msg.has_value())
     client_info.error_msg = error_msg->str();
+  */
 
   EmitToDestinations(&client_info);
 }

lldb/tools/lldb-dap/DAP.cpp

@@ -13,6 +13,7 @@
 #include <sstream>
 
 #include "DAP.h"
+#include "JSONUtils.h"
 #include "LLDBUtils.h"
 #include "lldb/API/SBCommandInterpreter.h"
 #include "llvm/ADT/StringExtras.h"
@@ -687,26 +688,45 @@ bool DAP::HandleObject(const llvm::json::Object &object) {
   if (packet_type == "request") {
     const auto command = GetString(object, "command");
     auto handler_pos = request_handlers.find(std::string(command));
-    llvm::json::Object telemetry_entry;
-    telemetry_entry.insert({"request_name", std::string(command)});
-    telemetry_entry.insert(
-        {"start_time", start_time.time_since_epoch().count()});
+    lldb::SBStructuredData telemetry_entry;
+
+    // There does not seem to be a direct way to construct an SBStructuredData.
+    // So we first create a json::Array object,
+    // then we serialize it to a string,
+    // and finally call SBStructuredData::SetFromJSON(string).
+    //
+    // TODO: This seems unnecessarily complex. Ideally, we should be able to
+    // just send a json::Object directly? Does the SB API allow json?
+    //
+    llvm::json::Array telemetry_array({
+        {"request_name", std::string(command)},
+        {"start_time", start_time.time_since_epoch().count()},
+    });
 
     if (handler_pos != request_handlers.end()) {
       handler_pos->second(object);
       auto end_time = std::chrono::steady_clock::now();
-      telemetry_entry.insert({"end_time", end_time.time_since_epoch().count()});
+      telemetry_array.push_back(
+          llvm::json::Value{"end_time", end_time.time_since_epoch().count()});
+
+      llvm::json::Value val(std::move(telemetry_array));
+      std::string string_rep = lldb_dap::JSONToString(val);
+      telemetry_entry.SetFromJSON(string_rep.c_str());
       debugger.SendTelemetry(telemetry_entry);
       return true; // Success
     } else {
       if (log)
         *log << "error: unhandled command \"" << command.data() << "\""
              << std::endl;
       auto end_time = std::chrono::steady_clock::now();
-      telemetry_entry.insert({"end_time", end_time.time_since_epoch().count()});
-      telemetry_entry.insert(
-          {"error", "unhandled-command:" + std::string(command)});
-      debugger.SendTelemetry(telemetry_entry);
+      telemetry_array.push_back(
+          llvm::json::Value{"end_time", end_time.time_since_epoch().count()});
+      telemetry_array.push_back(llvm::json::Value{
+          "error", llvm::Twine("unhandled-command:" + command).str()});
+
+      llvm::json::Value val(std::move(telemetry_array));
+      std::string string_rep = lldb_dap::JSONToString(val);
+      telemetry_entry.SetFromJSON(string_rep.c_str());
       debugger.SendTelemetry(telemetry_entry);
       return false; // Fail
     }