don't use mangled symbol names in startup log

Author: dgoffredo

src/datadog/collector.h

@@ -37,8 +37,8 @@ class Collector {
   // object's configuration. The JSON representation is an object with
   // the following properties:
   //
-  // - "type" is the unmangled, unqualified name of the most-derived class, e.g.
-  //   "DatadogAgent".
+  // - "type" is the unmangled, qualified name of the most-derived class, e.g.
+  //   "datadog::tracing::DatadogAgent".
   // - "config" is an object containing this object's configuration. "config"
   //   may be omitted if the derived class has no configuration.
   virtual void config_json(nlohmann::json& destination) const = 0;

src/datadog/curl.cpp

@@ -19,6 +19,7 @@
 #include "dict_reader.h"
 #include "dict_writer.h"
 #include "http_client.h"
+#include "json.hpp"
 #include "logger.h"
 #include "parse_util.h"
 
@@ -125,6 +126,10 @@ void Curl::drain(std::chrono::steady_clock::time_point deadline) {
   impl_->drain(deadline);
 }
 
+void Curl::config_json(nlohmann::json &destination) const {
+  destination = nlohmann::json::object({{"type", "datadog::tracing::Curl"}});
+}
+
 CurlImpl::CurlImpl(const std::shared_ptr<Logger> &logger)
     : logger_(logger), shutting_down_(false), num_active_handles_(0) {
   curl_global_init(CURL_GLOBAL_ALL);

src/datadog/curl.h

@@ -14,6 +14,7 @@
 #include <string>
 
 #include "http_client.h"
+#include "json_fwd.hpp"
 
 namespace datadog {
 namespace tracing {
@@ -35,6 +36,8 @@ class Curl : public HTTPClient {
                       ErrorHandler on_error) override;
 
   void drain(std::chrono::steady_clock::time_point deadline) override;
+
+  void config_json(nlohmann::json& destination) const override;
 };
 
 }  // namespace tracing

src/datadog/datadog_agent.cpp

@@ -169,15 +169,18 @@ void DatadogAgent::config_json(nlohmann::json& destination) const {
   const auto flush_interval_milliseconds =
       std::chrono::duration_cast<std::chrono::milliseconds>(flush_interval_)
           .count();
+  nlohmann::json http_client_json, event_scheduler_json;
+  http_client_->config_json(http_client_json);
+  event_scheduler_->config_json(event_scheduler_json);
 
   // clang-format off
   destination = nlohmann::json::object({
-    {"type", "DatadogAgent"},
+    {"type", "datadog::tracing::DatadogAgent"},
     {"config", nlohmann::json::object({
       {"url", (url.scheme + "://" + url.authority + url.path)},
       {"flush_interval_milliseconds", flush_interval_milliseconds},
-      {"http_client_typeid", typeid(*http_client_).name()},
-      {"event_scheduler_typeid", typeid(*event_scheduler_).name()},
+      {"http_client", http_client_json},
+      {"event_scheduler", event_scheduler_json},
     })},
   });
   // clang-format on

src/datadog/event_scheduler.h

@@ -13,6 +13,7 @@
 #include <functional>
 
 #include "error.h"
+#include "json_fwd.hpp"
 
 namespace datadog {
 namespace tracing {
@@ -29,6 +30,16 @@ class EventScheduler {
       std::chrono::steady_clock::duration interval,
       std::function<void()> callback) = 0;
 
+  // Assign to the specified `destination` a JSON representation of this
+  // object's configuration. The JSON representation is an object with
+  // the following properties:
+  //
+  // - "type" is the unmangled, qualified name of the most-derived class, e.g.
+  //   "datadog::tracing::ThreadedEventScheduler".
+  // - "config" is an object containing this object's configuration. "config"
+  //   may be omitted if the derived class has no configuration.
+  virtual void config_json(nlohmann::json& destination) const = 0;
+
   virtual ~EventScheduler() = default;
 };
 

src/datadog/http_client.h

@@ -14,6 +14,7 @@
 
 #include "error.h"
 #include "expected.h"
+#include "json_fwd.hpp"
 
 namespace datadog {
 namespace tracing {
@@ -51,6 +52,16 @@ class HTTPClient {
   // `deadline`.
   virtual void drain(std::chrono::steady_clock::time_point deadline) = 0;
 
+  // Assign to the specified `destination` a JSON representation of this
+  // object's configuration. The JSON representation is an object with
+  // the following properties:
+  //
+  // - "type" is the unmangled, qualified name of the most-derived class, e.g.
+  //   "datadog::tracing::Curl".
+  // - "config" is an object containing this object's configuration. "config"
+  //   may be omitted if the derived class has no configuration.
+  virtual void config_json(nlohmann::json& destination) const = 0;
+
   virtual ~HTTPClient() = default;
 };
 

src/datadog/null_collector.cpp

@@ -8,7 +8,7 @@ namespace tracing {
 void NullCollector::config_json(nlohmann::json& destination) const {
   // clang-format off
     destination = nlohmann::json::object({
-        {"type", "NullCollector"},
+        {"type", "datadog::tracing::NullCollector"},
         {"config", nlohmann::json::object({})},
     });
   // clang-format on

src/datadog/threaded_event_scheduler.cpp

@@ -2,6 +2,8 @@
 
 #include <thread>
 
+#include "json.hpp"
+
 namespace datadog {
 namespace tracing {
 
@@ -56,6 +58,11 @@ EventScheduler::Cancel ThreadedEventScheduler::schedule_recurring_event(
   };
 }
 
+void ThreadedEventScheduler::config_json(nlohmann::json& destination) const {
+  destination = nlohmann::json::object(
+      {{"type", "datadog::tracing::ThreadedEventScheduler"}});
+}
+
 void ThreadedEventScheduler::run() {
   std::unique_lock<std::mutex> lock(mutex_);
 

src/datadog/threaded_event_scheduler.h

@@ -54,9 +54,10 @@ class ThreadedEventScheduler : public EventScheduler {
   ThreadedEventScheduler();
   ~ThreadedEventScheduler();
 
-  virtual Cancel schedule_recurring_event(
-      std::chrono::steady_clock::duration interval,
-      std::function<void()> callback) override;
+  Cancel schedule_recurring_event(std::chrono::steady_clock::duration interval,
+                                  std::function<void()> callback) override;
+
+  void config_json(nlohmann::json& destination) const override;
 };
 
 }  // namespace tracing

test/mocks/event_schedulers.h

@@ -3,6 +3,7 @@
 #include <datadog/event_scheduler.h>
 
 #include <chrono>
+#include <datadog/json.hpp>
 #include <functional>
 #include <optional>
 
@@ -19,4 +20,8 @@ struct MockEventScheduler : public EventScheduler {
     recurrence_interval = interval;
     return [this]() { cancelled = true; };
   }
+
+  void config_json(nlohmann::json& destination) const override {
+    destination = nlohmann::json::object({{"type", "MockEventScheduler"}});
+  }
 };