fix: failing tests

Author: Doohl

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

@@ -47,9 +47,6 @@ 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));
@@ -67,6 +64,9 @@ private static void addExtrasToProtoBuilder(LogRecordData source, LogRecord.Buil
     target.trace_id(ByteStringMapper.getInstance().stringToProto(spanContext.getTraceId()));
     target.dropped_attributes_count(
         source.getTotalAttributeCount() - source.getAttributes().size());
+    if (source.getEventName() != null) {
+      target.event_name(source.getEventName());
+    }
   }
 
   public LogRecordData mapToSdk(
@@ -80,9 +80,6 @@ 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);
 
@@ -105,6 +102,7 @@ private static void addExtrasToSdkItemBuilder(
     target.setTotalAttributeCount(source.dropped_attributes_count + attributes.size());
     target.setResource(resource);
     target.setInstrumentationScopeInfo(scopeInfo);
+    target.setEventName(source.event_name);
   }
 
   private static AnyValue bodyToAnyValue(Value<?> body) {

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

@@ -37,6 +37,7 @@ class ProtoLogsDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   private static final LogRecordData OTHER_LOG_RECORD =
@@ -51,6 +52,7 @@ class ProtoLogsDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   private static final LogRecordData LOG_RECORD_WITH_DIFFERENT_SCOPE_SAME_RESOURCE =
@@ -65,6 +67,7 @@ class ProtoLogsDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   private static final LogRecordData LOG_RECORD_WITH_DIFFERENT_RESOURCE =
@@ -79,6 +82,7 @@ class ProtoLogsDataMapperTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   private static final LogRecordData LOG_RECORD_WITH_EVENT_NAME =

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/serializers/LogRecordDataSerializerTest.java

@@ -28,9 +28,10 @@ class LogRecordDataSerializerTest extends BaseSignalSerializerTest<LogRecordData
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("event")
           .build();
 
-  private static final LogRecordData LOG_RECORD_WITHOUT_SEVERITY_TEXT =
+  private static final LogRecordData LOG_RECORD_WITHOUT_SEVERITY_OR_EVENT_NAME_TEXT =
       LogRecordDataImpl.builder()
           .setResource(TestData.RESOURCE_FULL)
           .setSpanContext(TestData.SPAN_CONTEXT)
@@ -42,11 +43,12 @@ class LogRecordDataSerializerTest extends BaseSignalSerializerTest<LogRecordData
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   @Test
   void verifySerialization() {
-    assertSerialization(LOG_RECORD, LOG_RECORD_WITHOUT_SEVERITY_TEXT);
+    assertSerialization(LOG_RECORD, LOG_RECORD_WITHOUT_SEVERITY_OR_EVENT_NAME_TEXT);
   }
 
   @Override

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFileTest.java

@@ -57,6 +57,7 @@ class ReadableFileTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   private static final LogRecordData SECOND_LOG_RECORD =
@@ -71,6 +72,7 @@ class ReadableFileTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("event")
           .build();
 
   private static final LogRecordData THIRD_LOG_RECORD =
@@ -85,6 +87,7 @@ class ReadableFileTest {
           .setTimestampEpochNanos(100L)
           .setObservedTimestampEpochNanos(200L)
           .setTotalAttributeCount(3)
+          .setEventName("")
           .build();
 
   @BeforeEach