Fix reading log with fields in reverse order

gchq · Aug 13, 2024 · adb98ec · adb98ec
1 parent 8bf2804
commit adb98ec
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/...s/src/main/java/sleeper/systemtest/drivers/statestore/StateStoreCommitterRunsBuilder.java b/...s/src/main/java/sleeper/systemtest/drivers/statestore/StateStoreCommitterRunsBuilder.java
@@ -43,8 +43,10 @@ public void add(List<ResultField> entry) {
             switch (field.field()) {
                 case "@logStream":
                     logStream = logStreamByName.computeIfAbsent(field.value(), name -> new LogStream());
+                    break;
                 case "@message":
                     message = field.value();
+                    break;
                 default:
             }
         }

diff --git a/...c/test/java/sleeper/systemtest/drivers/statestore/StateStoreCommitterRunsBuilderTest.java b/...c/test/java/sleeper/systemtest/drivers/statestore/StateStoreCommitterRunsBuilderTest.java
@@ -76,10 +76,26 @@ void shouldIgnoreUnrecognisedLog() {
         assertThat(builder.buildRuns()).isEmpty();
     }
 
+    @Test
+    void shouldReadLogWithFieldsInReverseOrder() {
+        // Given
+        addReversingFields("test-logstream", "[main] committer.lambda.StateStoreCommitterLambda INFO - Lambda started at 2024-08-13T12:12:00Z");
+        addReversingFields("test-logstream", "[main] committer.lambda.StateStoreCommitterLambda INFO - Lambda finished at 2024-08-13T12:13:00Z (ran for 1 minute)");
+
+        // When / Then
+        assertThat(builder.buildRuns()).containsExactly(
+                new StateStoreCommitterRun(Instant.parse("2024-08-13T12:12:00Z"), Instant.parse("2024-08-13T12:13:00Z"), List.of()));
+    }
+
     void add(String logStream, String message) {
         builder.add(List.of(
                 ResultField.builder().field("@logStream").value(logStream).build(),
                 ResultField.builder().field("@message").value(message).build()));
     }
 
+    void addReversingFields(String logStream, String message) {
+        builder.add(List.of(
+                ResultField.builder().field("@message").value(message).build(),
+                ResultField.builder().field("@logStream").value(logStream).build()));
+    }
 }