etw exporter headers added

open-telemetry · Oct 26, 2020 · 78ccc23 · 78ccc23
1 parent e2cda38
commit 78ccc23
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 122 deletions.
diff --git a/api/include/opentelemetry/common/key_value_iterable.h b/api/include/opentelemetry/common/key_value_iterable.h
@@ -30,5 +30,21 @@ class KeyValueIterable
    */
   virtual size_t size() const noexcept = 0;
 };
+
+//
+// NULL object pattern empty iterable.
+//
+class NullKeyValueIterable : public KeyValueIterable
+{
+public:
+  NullKeyValueIterable(){};
+  virtual bool ForEachKeyValue(
+      nostd::function_ref<bool(nostd::string_view, common::AttributeValue)>) const noexcept
+  {
+    return true;
+  };
+  virtual size_t size() const noexcept { return 0; }
+};
+
 }  // namespace common
 OPENTELEMETRY_END_NAMESPACE
diff --git a/api/include/opentelemetry/trace/key_value_iterable.h b/api/include/opentelemetry/trace/key_value_iterable.h
diff --git a/api/include/opentelemetry/trace/key_value_iterable_view.h b/api/include/opentelemetry/trace/key_value_iterable_view.h
diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer_exporter.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_tracer_exporter.h
@@ -23,7 +23,7 @@
 #include <opentelemetry/nostd/string_view.h>
 #include <opentelemetry/nostd/unique_ptr.h>
 
-#include <opentelemetry/trace/key_value_iterable_view.h>
+#include <opentelemetry/common/key_value_iterable_view.h>
 #include <opentelemetry/trace/span.h>
 #include <opentelemetry/trace/span_id.h>
 #include <opentelemetry/trace/trace_id.h>
@@ -115,7 +115,7 @@ class Tracer : public trace::Tracer
   /// <returns>Span</returns>
   virtual nostd::shared_ptr<trace::Span> StartSpan(
       nostd::string_view name,
-      const trace::KeyValueIterable &attributes,
+      const common::KeyValueIterable &attributes,
       const trace::StartSpanOptions &options = {}) noexcept override
   {
     // TODO: support attributes
@@ -151,7 +151,7 @@ class Tracer : public trace::Tracer
   void AddEvent(Span &span,
                 nostd::string_view name,
                 core::SystemTimestamp timestamp,
-                const trace::KeyValueIterable &attributes) noexcept
+                const common::KeyValueIterable &attributes) noexcept
   {
     // TODO: associate events with span
     (void)span;
@@ -192,7 +192,7 @@ class Tracer : public trace::Tracer
   /// <returns></returns>
   void AddEvent(Span &span, nostd::string_view name, core::SystemTimestamp timestamp) noexcept
   {
-    AddEvent(span, name, timestamp, trace::NullKeyValueIterable());
+    AddEvent(span, name, timestamp, common::NullKeyValueIterable());
   };
 
   /// <summary>
@@ -202,7 +202,7 @@ class Tracer : public trace::Tracer
   /// <param name="name"></param>
   void AddEvent(Span &span, nostd::string_view name)
   {
-    AddEvent(span, name, std::chrono::system_clock::now(), trace::NullKeyValueIterable());
+    AddEvent(span, name, std::chrono::system_clock::now(), common::NullKeyValueIterable());
   };
 
   virtual ~Tracer() { CloseWithMicroseconds(0); };
@@ -264,7 +264,7 @@ class Span : public trace::Span
   /// <returns></returns>
   void AddEvent(nostd::string_view name,
                 core::SystemTimestamp timestamp,
-                const trace::KeyValueIterable &attributes) noexcept override
+                const common::KeyValueIterable &attributes) noexcept override
   {
     owner.AddEvent(*this, name, timestamp, attributes);
   }