tests: adjust event sizes for DLQ boundaries with CBOR stringref extension

With the CBOR stringref extension enabled, we add a 3-byte overhead to each
event to activate the extension, and eliminate 24 bytes of overhead for each
event's secondary instances of `org.logstash.ConvertedMap`. Since the events
under test have exactly two instances of `org.logstash.ConvertedMap`, this
is a net reduction of 21 bytes of overhead.

This changes the specifically-constructed events to have the intended lengths
to test their specific edge-cases.

Author: yaauie

logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java

@@ -72,7 +72,7 @@ public class DeadLetterQueueReaderTest {
     private Path dir;
     private int defaultDlqSize = 100_000_000; // 100mb
 
-    private static final int PAD_FOR_BLOCK_SIZE_EVENT = 32490;
+    private static final int PAD_FOR_BLOCK_SIZE_EVENT = 32511;
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -240,7 +240,7 @@ private void validateEntries(Path firstLog, int startEntry, int endEntry, int st
     // This test tests for a single event that ends on a block boundary
     @Test
     public void testBlockBoundary() throws Exception {
-        final int PAD_FOR_BLOCK_SIZE_EVENT = 32490;
+        final int PAD_FOR_BLOCK_SIZE_EVENT = 32511;
         Event event = createEventWithConstantSerializationOverhead();
         char[] field = new char[PAD_FOR_BLOCK_SIZE_EVENT];
         Arrays.fill(field, 'e');
@@ -267,7 +267,7 @@ public void testBlockBoundary() throws Exception {
     @Test
     public void testBlockBoundaryMultiple() throws Exception {
         Event event = createEventWithConstantSerializationOverhead();
-        char[] field = new char[7929];
+        char[] field = new char[7950];
         Arrays.fill(field, 'x');
         event.setField("message", new String(field));
         long startTime = System.currentTimeMillis();
@@ -935,7 +935,7 @@ private int prepareFilledSegmentFiles(int segments) throws IOException {
 
     private int prepareFilledSegmentFiles(int segments, long start) throws IOException {
         final Event event = createEventWithConstantSerializationOverhead(Collections.emptyMap());
-        event.setField("message", generateMessageContent(32479));
+        event.setField("message", generateMessageContent(32500));
 
         DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", 1), constantSerializationLengthTimestamp(start));
         assertEquals("Serialized dlq entry + header MUST be 32Kb (size of a block)", BLOCK_SIZE, entry.serialize().length + 13);

logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueWriterAgeRetentionTest.java

@@ -105,7 +105,7 @@ public void setUp() throws Exception {
     @Test
     public void testRemovesOlderSegmentsWhenWriteOnReopenedDLQContainingExpiredSegments() throws IOException {
         final Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
-        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32500));
 
         final Clock pointInTimeFixedClock = Clock.fixed(Instant.parse("2022-02-22T10:20:30.00Z"), ZoneId.of("Europe/Rome"));
         final ForwardableClock fakeClock = new ForwardableClock(pointInTimeFixedClock);
@@ -160,7 +160,7 @@ private void prepareDLQWithFirstSegmentOlderThanRetainPeriod(Event event, Forwar
     @Test
     public void testRemovesOlderSegmentsWhenWritesIntoDLQContainingExpiredSegments() throws IOException {
         final Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
-        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32500));
 
         long startTime = fakeClock.instant().toEpochMilli();
         int messageSize = 0;
@@ -203,7 +203,7 @@ public void testRemovesOlderSegmentsWhenWritesIntoDLQContainingExpiredSegments()
     @Test
     public void testRemoveMultipleOldestSegmentsWhenRetainedAgeIsExceeded() throws IOException {
         final Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
-        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32500));
 
         long startTime = fakeClock.instant().toEpochMilli();
         int messageSize = 0;

logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueWriterTest.java

@@ -251,7 +251,7 @@ static String generateASCIIMessageContent(int size, byte fillChar) {
     @Test
     public void testRemoveOldestSegmentWhenRetainedSizeIsExceededAndDropOlderModeIsEnabled() throws IOException {
         Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
-        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32500));
         long startTime = System.currentTimeMillis();
 
         int messageSize = 0;
@@ -488,7 +488,7 @@ public void testReadTimestampOfLastEventInSegmentWithDeletedSegment() throws IOE
     @Test
     public void testDropEventCountCorrectlyNotEnqueuedEvents() throws IOException, InterruptedException {
         Event blockAlmostFullEvent = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
-        int serializationHeader = 286;
+        int serializationHeader = 265;
         int notEnoughHeaderSpace = 5;
         blockAlmostFullEvent.setField("message", DeadLetterQueueReaderTest.generateMessageContent(BLOCK_SIZE - serializationHeader - RECORD_HEADER_SIZE + notEnoughHeaderSpace));
 
@@ -501,7 +501,7 @@ public void testDropEventCountCorrectlyNotEnqueuedEvents() throws IOException, I
             // enqueue a record with size smaller than BLOCK_SIZE
             DLQEntry entry = new DLQEntry(blockAlmostFullEvent, "", "", "00001", DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(System.currentTimeMillis()));
             assertEquals("Serialized plus header must not leave enough space for another record header ",
-                    entry.serialize().length, BLOCK_SIZE - RECORD_HEADER_SIZE - notEnoughHeaderSpace);
+                    BLOCK_SIZE - RECORD_HEADER_SIZE - notEnoughHeaderSpace, entry.serialize().length);
             writeManager.writeEntry(entry);
 
             // enqueue a record bigger than BLOCK_SIZE
@@ -512,7 +512,7 @@ public void testDropEventCountCorrectlyNotEnqueuedEvents() throws IOException, I
 
         // fill the queue to push out the segment with the 2 previous events
         Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
-        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32500));
         try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
                 .newBuilder(dir, 10 * MB, 20 * MB, Duration.ofSeconds(1))
                 .storageType(QueueStorageType.DROP_NEWER)