Refactor export process in user_events

Author: ThomsonTan

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

@@ -117,11 +117,15 @@ class Recordable final : public opentelemetry::sdk::logs::Recordable
 
 private:
   ehd::EventBuilder event_builder_;
-  int level_index_;
+  int64_t event_id_               = 0;
+  nostd::string_view event_name_;
+  int level_index_                = 0;
   size_t cs_part_b_bookmark_      = 0;
   size_t cs_part_b_bookmark_size_ = 0;
   size_t cs_part_c_bookmark_      = 0;
   size_t cs_part_c_bookmark_size_ = 0;
+  uint_8 severity_                = 0; 
+  bool has_event_id_              = false;
 };
 
 }  // namespace logs

exporters/user_events/src/recordable.cc

@@ -17,50 +17,58 @@ namespace logs
 
 namespace api_logs = opentelemetry::logs;
 
-Recordable::Recordable() noexcept
-{
-  event_builder_.Reset("OpenTelemetry-Logs");
-
-  utils::PopulateAttribute("__csver__", static_cast<uint16_t>(0x400), event_builder_);
-}
+Recordable::Recordable() noexcept {}
 
 void Recordable::SetSeverity(api_logs::Severity severity) noexcept
 {
   uint8_t severity_value = static_cast<uint8_t>(severity);
-  if (severity_value == 0 || severity_value > 24)
+  if (severity_value > 24)
   {
     OTEL_INTERNAL_LOG_ERROR(
         "[user_events Log Exporter] Recordable: invalid severity value: " << severity_value);
-    severity_value = 1;
+    severity_value = 0;
   }
 
+  severity_ = severity_value;
   level_index_ = (severity_value - 1) >> 2;
-
-  cs_part_b_bookmark_size_ += 2;
-  event_builder_.AddValue("severityNumber", static_cast<uint16_t>(severity_value),
-                          event_field_format_default);
-  auto severity_text = api_logs::SeverityNumToText[static_cast<uint32_t>(severity_value)].data();
-  event_builder_.AddString<char>("severityText", severity_text, event_field_format_default);
 }
 
 void Recordable::SetBody(const opentelemetry::common::AttributeValue &message) noexcept
 {
-  // Set intial bookmark size to 1 for body below.
-  cs_part_b_bookmark_size_++;
+  if (severity_ == 0)
+  {
+    OTEL_INTERNAL_LOG_ERROR("[user_events Log Exporter] Recordable: severity is not set.");
+    return;
+  }
+
+  auto event_name = !event_name_.empty() ? event_name_.data() : "OpenTelemetryLogs";
+
+  event_builder_.Reset(event_name);
+  utils::PopulateAttribute("__csver__", static_cast<uint16_t>(0x400), event_builder_);
+
   event_builder_.AddStruct("PartB", 1, 0, &cs_part_b_bookmark_);
   utils::PopulateAttribute("_typeName", "Log", event_builder_);
+
+  event_builder_.AddValue("severityNumber", static_cast<uint16_t>(severity_),
+                          event_field_format_default);
+  auto severity_text = api_logs::SeverityNumToText[static_cast<uint32_t>(severity_value)].data();
+  event_builder_.AddString<char>("severityText", severity_text, event_field_format_default);
+  cs_part_b_bookmark_size_ = 4; // with the below body counted because it is available.
+
+  if (has_event_id_)
+  {
+    utils::PopulateAttribute("eventId", event_id_, event_builder_);
+    cs_part_b_bookmark_size_++;
+  }
+
   utils::PopulateAttribute("body", message, event_builder_);
 }
 
 void Recordable::SetEventId(int64_t id, nostd::string_view name) noexcept
 {
-  cs_part_b_bookmark_size_++;
-  utils::PopulateAttribute("eventId", id, event_builder_);
-  if (!name.empty())
-  {
-    cs_part_b_bookmark_size_++;
-    utils::PopulateAttribute("name", name, event_builder_);
-  }
+  has_event_id_ = true;
+  event_id_.id_ = id;
+  event_name_ = name;
 }
 
 void Recordable::SetTraceId(const opentelemetry::trace::TraceId &trace_id) noexcept