wip

Author: avsej

core/tracing/otel_tracer.cxx

@@ -22,50 +22,62 @@
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-conversion"
+#pragma GCC diagnostic ignored "-Wdeprecated-builtins"
+#elif defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-builtins"
 #endif
 #include <opentelemetry/trace/provider.h>
 #include <opentelemetry/trace/tracer.h>
 #if defined(__GNUC__)
 #pragma GCC diagnostic pop
+#elif defined(__clang__)
+#pragma clang diagnostic pop
 #endif
 
 namespace couchbase::core::tracing
 {
-namespace
-{
-class otel_request_span : public couchbase::tracing::request_span
+
+auto
+otel_request_span::wrapped_span() -> std::shared_ptr<opentelemetry::trace::Span>
 {
-public:
-  explicit otel_request_span(opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> span)
-    : span_(std::move(span))
-  {
-  }
+  return span_;
+}
 
-  void add_tag(const std::string& name, const std::string& value) override
-  {
-    span_->SetAttribute(name, value);
-  }
+void
+otel_request_span::end()
+{
+  span_->End();
+}
 
-  void add_tag(const std::string& name, std::uint64_t value) override
-  {
-    span_->SetAttribute(name, value);
-  }
+void
+otel_request_span::add_tag(const std::string& name, std::uint64_t value)
+{
+  span_->SetAttribute(name, value);
+}
 
-  void end() override
-  {
-    span_->End();
-  }
+void
+otel_request_span::add_tag(const std::string& name, const std::string& value)
+{
+  span_->SetAttribute(name, value);
+}
 
-  auto wrapped_span() -> opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>
-  {
-    return span_;
-  }
+otel_request_span::otel_request_span(std::shared_ptr<opentelemetry::trace::Span> span)
+  : span_(std::move(span))
+{
+}
 
-private:
-  opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> span_;
-};
+otel_request_span::~otel_request_span()
+{
+  span_->End();
+}
 
-} // namespace
+auto
+otel_request_span::wrap(std::shared_ptr<opentelemetry::trace::Span> span)
+  -> std::shared_ptr<otel_request_span>
+{
+  return std::make_shared<otel_request_span>(span);
+}
 
 class otel_request_tracer_impl
 {
@@ -80,15 +92,32 @@ class otel_request_tracer_impl
   {
   }
 
+  explicit otel_request_tracer_impl(std::shared_ptr<opentelemetry::trace::Tracer> tracer)
+    : tracer_{ std::move(tracer) }
+  {
+  }
+
 private:
-  opentelemetry::nostd::shared_ptr<opentelemetry::trace::Tracer> tracer_;
+  std::shared_ptr<opentelemetry::trace::Tracer> tracer_;
 };
 
 otel_request_tracer::otel_request_tracer()
   : impl_{ std::make_unique<otel_request_tracer_impl>() }
 {
 }
 
+otel_request_tracer::otel_request_tracer(std::shared_ptr<opentelemetry::trace::Tracer> tracer)
+  : impl_{ std::make_unique<otel_request_tracer_impl>(std::move(tracer)) }
+{
+}
+
+auto
+otel_request_tracer::wrap(std::shared_ptr<opentelemetry::trace::Tracer> tracer)
+  -> std::shared_ptr<otel_request_tracer>
+{
+  return std::make_shared<couchbase::core::tracing::otel_request_tracer>(std::move(tracer));
+}
+
 otel_request_tracer::~otel_request_tracer() = default;
 
 auto
@@ -100,9 +129,9 @@ otel_request_tracer::start_span(std::string name,
   if (wrapped_parent) {
     opentelemetry::trace::StartSpanOptions opts;
     opts.parent = wrapped_parent->wrapped_span()->GetContext();
-    return std::make_shared<otel_request_span>(impl_->tracer_->StartSpan(name, opts));
+    return otel_request_span::wrap(impl_->tracer_->StartSpan(name, opts));
   }
-  return std::make_shared<otel_request_span>(impl_->tracer_->StartSpan(name));
+  return otel_request_span::wrap(impl_->tracer_->StartSpan(name));
 }
 
 } // namespace couchbase::core::tracing

core/tracing/otel_tracer.hxx

@@ -19,15 +19,51 @@
 
 #include <couchbase/tracing/request_tracer.hxx>
 
+#include <opentelemetry/version.h>
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace trace
+{
+class Tracer;
+class Span;
+} // namespace trace
+OPENTELEMETRY_END_NAMESPACE
+
 namespace couchbase::core::tracing
 {
 
+class otel_request_span : public couchbase::tracing::request_span
+{
+public:
+  static auto wrap(std::shared_ptr<opentelemetry::trace::Span> span)
+    -> std::shared_ptr<otel_request_span>;
+
+  explicit otel_request_span(std::shared_ptr<opentelemetry::trace::Span> span);
+  ~otel_request_span() override;
+  otel_request_span(const otel_request_span&) = delete;
+  otel_request_span(otel_request_span&&) = delete;
+  auto operator=(const otel_request_span&) -> otel_request_span& = delete;
+  auto operator=(otel_request_span&&) -> otel_request_span& = delete;
+
+  void add_tag(const std::string& name, const std::string& value) override;
+  void add_tag(const std::string& name, std::uint64_t value) override;
+  void end() override;
+  auto wrapped_span() -> std::shared_ptr<opentelemetry::trace::Span>;
+
+private:
+  std::shared_ptr<opentelemetry::trace::Span> span_;
+};
+
 class otel_request_tracer_impl;
 
 class otel_request_tracer : public couchbase::tracing::request_tracer
 {
 public:
+  static auto wrap(std::shared_ptr<opentelemetry::trace::Tracer> tracer)
+    -> std::shared_ptr<otel_request_tracer>;
+
   otel_request_tracer();
+  explicit otel_request_tracer(std::shared_ptr<opentelemetry::trace::Tracer> tracer);
   otel_request_tracer(const otel_request_tracer&) = delete;
   otel_request_tracer(otel_request_tracer&&) noexcept = default;
   auto operator=(const otel_request_tracer&) = delete;

couchbase/error_context.hxx

@@ -39,6 +39,9 @@ public:
   [[nodiscard]] auto to_json(
     error_context_json_format format = error_context_json_format::compact) const -> std::string;
 
+  [[nodiscard]] auto to_attributes(
+    error_context_json_format format = error_context_json_format::compact) const -> std::string;
+
   [[nodiscard]] auto impl() const -> std::shared_ptr<internal_error_context>;
 
 private:

tools/CMakeLists.txt

@@ -42,7 +42,8 @@ target_link_libraries(
   hdr_histogram_static
   asio
   opentelemetry_trace
-  opentelemetry_exporter_otlp_http)
+  opentelemetry_exporter_otlp_http
+  opentelemetry_exporter_otlp_http_log)
 
 if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL AND WIN32)
   # Ignore the `LNK4099: PDB ['crypto.pdb'|'ssl.pdb'] was not found` warnings, as we don't (atm) keep track fo the *.PDB