[user_events exporter] Fix event_field_format_ flag in PopulateAttribute (#292)

Author: ThomsonTan

exporters/user_events/CMakeLists.txt

@@ -21,7 +21,7 @@ add_definitions(-DHAVE_CONSOLE_LOG -DENABLE_LOGS_PREVIEW)
 
 if(MAIN_PROJECT)
   # TODO: cleanup the dependent packages
-  find_package(protobuf REQUIRED)
+  find_package(Protobuf REQUIRED)
   find_package(CURL REQUIRED)
   find_package(nlohmann_json REQUIRED)
   find_package(opentelemetry-cpp REQUIRED)

exporters/user_events/Docker/Dockerfile

@@ -42,13 +42,6 @@ RUN cd /work && \
     ninja && \
     ninja install
 
-RUN cd /work && \
-    git clone --recursive --depth=1 https://github.com/protocolbuffers/protobuf.git && \
-    cd protobuf && mkdir build && cd build && \
-    cmake -G Ninja -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_EXAMPLES=OFF .. && \
-    ninja && \
-    ninja install
-
 RUN cd /work && \
     git clone --recursive --depth=1 https://github.com/open-telemetry/opentelemetry-cpp-contrib
 
@@ -57,4 +50,4 @@ RUN cd /work && \
     mkdir build && cd build && \
     cmake -G Ninja -D CMAKE_BUILD_TYPE=Debug .. && \
     ninja && \
-    ninja install
+    ninja install

exporters/user_events/include/opentelemetry/exporters/user_events/logs/exporter.h

@@ -29,7 +29,7 @@ namespace sdk_logs = opentelemetry::sdk::logs;
 class Exporter final : public opentelemetry::sdk::logs::LogRecordExporter
 {
 public:
-  Exporter(const ExporterOptions &options) noexcept;
+  explicit Exporter(const ExporterOptions &options) noexcept;
 
   /**
    * Exports a span of logs sent from the processor.

exporters/user_events/src/utils.cc

@@ -17,6 +17,27 @@ namespace api_common = opentelemetry::common;
 
 const int kAttributeValueSize = 16;
 
+//
+// Iterator which convers "nostd::string_view *" to "std::string_view *".
+// This is needed to pass a span of "nostd::string_view" to EventBuilder::AddStringRange.
+//
+struct StringViewIterator
+{
+  const nostd::string_view *m_ptr;
+  explicit StringViewIterator(const nostd::string_view *ptr) noexcept : m_ptr(ptr) {}
+  bool operator==(StringViewIterator other) const noexcept { return m_ptr == other.m_ptr; }
+  bool operator!=(StringViewIterator other) const noexcept { return m_ptr != other.m_ptr; }
+  const std::string_view operator*() const noexcept
+  {
+    return std::string_view(m_ptr->data(), m_ptr->size());
+  }
+  StringViewIterator &operator++() noexcept
+  {
+    m_ptr += 1;
+    return *this;
+  }
+};
+
 void PopulateAttribute(nostd::string_view key,
                        const api_common::AttributeValue &value,
                        ehd::EventBuilder &event_builder) noexcept
@@ -26,17 +47,19 @@ void PopulateAttribute(nostd::string_view key,
 
   const char *key_name = key.data();
 
+  // TODO: implement this with a visitor
+
   if (nostd::holds_alternative<bool>(value))
   {
-    event_builder.AddValue(key_name, nostd::get<bool>(value), event_field_format_default);
+    event_builder.AddValue(key_name, nostd::get<bool>(value), event_field_format_boolean);
   }
   else if (nostd::holds_alternative<int>(value))
   {
-    event_builder.AddValue(key_name, nostd::get<int>(value), event_field_format_default);
+    event_builder.AddValue(key_name, nostd::get<int>(value), event_field_format_signed_int);
   }
   else if (nostd::holds_alternative<int64_t>(value))
   {
-    event_builder.AddValue(key_name, nostd::get<int64_t>(value), event_field_format_default);
+    event_builder.AddValue(key_name, nostd::get<int64_t>(value), event_field_format_signed_int);
   }
   else if (nostd::holds_alternative<unsigned int>(value))
   {
@@ -48,7 +71,7 @@ void PopulateAttribute(nostd::string_view key,
   }
   else if (nostd::holds_alternative<double>(value), event_field_format_default)
   {
-    event_builder.AddValue(key_name, nostd::get<double>(value), event_field_format_default);
+    event_builder.AddValue(key_name, nostd::get<double>(value), event_field_format_float);
   }
   else if (nostd::holds_alternative<const char *>(value))
   {
@@ -62,22 +85,53 @@ void PopulateAttribute(nostd::string_view key,
   }
   else if (nostd::holds_alternative<nostd::span<const uint8_t>>(value))
   {
-    // TODO: implement
+    auto value_span = nostd::get<nostd::span<const uint8_t>>(value);
+    event_builder.AddValueRange(key_name, value_span.begin(), value_span.end(),
+                                event_field_format_default);
   }
   else if (nostd::holds_alternative<nostd::span<const int>>(value))
-  {}
+  {
+    auto value_span = nostd::get<nostd::span<const int>>(value);
+    event_builder.AddValueRange(key_name, value_span.begin(), value_span.end(),
+                                event_field_format_signed_int);
+  }
   else if (nostd::holds_alternative<nostd::span<const int64_t>>(value))
-  {}
+  {
+    auto value_span = nostd::get<nostd::span<const int64_t>>(value);
+    event_builder.AddValueRange(key_name, value_span.begin(), value_span.end(),
+                                event_field_format_signed_int);
+  }
   else if (nostd::holds_alternative<nostd::span<const unsigned int>>(value))
-  {}
+  {
+    auto value_span = nostd::get<nostd::span<const unsigned int>>(value);
+    event_builder.AddValueRange(key_name, value_span.begin(), value_span.end(),
+                                event_field_format_default);
+  }
   else if (nostd::holds_alternative<nostd::span<const uint64_t>>(value))
-  {}
+  {
+    auto value_span = nostd::get<nostd::span<const unsigned int>>(value);
+    event_builder.AddValueRange(key_name, value_span.begin(), value_span.end(),
+                                event_field_format_default);
+  }
   else if (nostd::holds_alternative<nostd::span<const double>>(value))
-  {}
+  {
+    auto value_span = nostd::get<nostd::span<const double>>(value);
+    event_builder.AddValueRange(key_name, value_span.begin(), value_span.end(),
+                                event_field_format_float);
+  }
   else if (nostd::holds_alternative<nostd::span<const bool>>(value))
-  {}
+  {
+    auto value_span = nostd::get<nostd::span<const bool>>(value);
+    event_builder.AddValueRange(key_name, value_span.begin(), value_span.end(),
+                                event_field_format_boolean);
+  }
   else if (nostd::holds_alternative<nostd::span<const nostd::string_view>>(value))
-  {}
+  {
+    auto value_span = nostd::get<nostd::span<const nostd::string_view>>(value);
+    event_builder.AddStringRange<char>(key_name, StringViewIterator(value_span.data()),
+                                       StringViewIterator(value_span.data() + value_span.size()),
+                                       event_field_format_default);
+  }
 }
 
 }  // namespace utils