fix(disk-buffering): Add missing EventName to disk-buffering LogRecord data mapper

Author: Doohl

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/LogRecordDataMapper.java

@@ -47,6 +47,9 @@ public LogRecord mapToProto(LogRecordData source) {
     if (source.getBodyValue() != null) {
       logRecord.body(bodyToAnyValue(source.getBodyValue()));
     }
+    if (source.getEventName() != null) {
+      logRecord.event_name(source.getEventName());
+    }
 
     byte flags = source.getSpanContext().getTraceFlags().asByte();
     logRecord.flags(toUnsignedInt(flags));
@@ -77,6 +80,9 @@ public LogRecordData mapToSdk(
     if (source.body != null) {
       logRecordData.setBodyValue(anyValueToBody(source.body));
     }
+    if (source.event_name != null) {
+      logRecordData.setEventName(source.event_name);
+    }
 
     addExtrasToSdkItemBuilder(source, logRecordData, resource, scopeInfo);
 

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/models/LogRecordDataImpl.java

@@ -46,6 +46,10 @@ public ExtendedAttributes getExtendedAttributes() {
   @Nullable
   public abstract Value<?> getBodyValue();
 
+  @Override
+  @Nullable
+  public abstract String getEventName();
+
   @AutoValue.Builder
   public abstract static class Builder {
     public abstract Builder setResource(Resource value);
@@ -68,6 +72,8 @@ public abstract static class Builder {
 
     public abstract Builder setTotalAttributeCount(Integer value);
 
+    public abstract Builder setEventName(String value);
+
     public abstract LogRecordDataImpl build();
   }
 }

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/LogRecordDataMapperTest.java

@@ -31,6 +31,7 @@ class LogRecordDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("my.event.name")
           .build();
 
   @Test

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/mapping/logs/ProtoLogsDataMapperTest.java

@@ -81,6 +81,21 @@ class ProtoLogsDataMapperTest {
           .setTotalAttributeCount(3)
           .build();
 
+  private static final LogRecordData LOG_RECORD_WITH_EVENT_NAME =
+      LogRecordDataImpl.builder()
+          .setResource(TestData.RESOURCE_FULL)
+          .setSpanContext(TestData.SPAN_CONTEXT)
+          .setInstrumentationScopeInfo(TestData.INSTRUMENTATION_SCOPE_INFO_FULL)
+          .setAttributes(TestData.ATTRIBUTES)
+          .setBodyValue(Value.of("Log body"))
+          .setSeverity(Severity.DEBUG)
+          .setSeverityText("Log severity text")
+          .setTimestampEpochNanos(100L)
+          .setObservedTimestampEpochNanos(200L)
+          .setTotalAttributeCount(3)
+          .setEventName("test.event.name")
+          .build();
+
   @Test
   void verifyConversionDataStructure() {
     List<LogRecordData> signals = Collections.singletonList(LOG_RECORD);
@@ -160,6 +175,19 @@ void verifyMultipleLogsWithDifferentResource() {
     assertThat(mapFromProto(proto)).containsExactlyInAnyOrderElementsOf(signals);
   }
 
+  @Test
+  void verifyLogWithEventName() {
+    List<LogRecordData> signals = Collections.singletonList(LOG_RECORD_WITH_EVENT_NAME);
+
+    LogsData result = mapToProto(signals);
+
+    List<ResourceLogs> resourceLogsList = result.resource_logs;
+    LogRecord firstLog = resourceLogsList.get(0).scope_logs.get(0).log_records.get(0);
+
+    assertEquals("test.event.name", firstLog.event_name);
+    assertThat(mapFromProto(result)).containsExactlyInAnyOrderElementsOf(signals);
+  }
+
   private static LogsData mapToProto(Collection<LogRecordData> signals) {
     return ProtoLogsDataMapper.getInstance().toProto(signals);
   }