chore: update logback.xml to include exception and async

Author: coling01

src/test/java/uk/gov/hmcts/cp/integration/SpringLoggingIntegrationTest.java

@@ -1,51 +1,61 @@
 package uk.gov.hmcts.cp.integration;
 
+import ch.qos.logback.classic.AsyncAppender;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.api.AssertionsForClassTypes;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Slf4j
 class SpringLoggingIntegrationTest extends IntegrationTestBase {
-
-    private final PrintStream originalStdOut = System.out;
+    private PrintStream originalStdOut = System.out;
 
     @AfterEach
     void afterEach() {
         System.setOut(originalStdOut);
     }
 
     @Test
-    void springboot_test_should_log_correct_fields() throws IOException {
+    void springboot_test_should_log_correct_fields_including_exception() throws IOException {
         MDC.put("any-mdc-field", "1234-1234");
-        final ByteArrayOutputStream capturedStdOut = captureStdOut();
-        log.info("spring boot test message");
+        ByteArrayOutputStream capturedStdOut = captureStdOut();
+        log.info("spring boot test message", new RuntimeException("MyException"));
+        captureAsyncLogs();
 
-        final Map<String, Object> capturedFields = new ObjectMapper().readValue(capturedStdOut.toString(StandardCharsets.UTF_8), new TypeReference<>() {
+        String logMessage = capturedStdOut.toString();
+        AssertionsForClassTypes.assertThat(logMessage).isNotEmpty();
+        Map<String, Object> capturedFields = new ObjectMapper().readValue(logMessage, new TypeReference<>() {
         });
-
-        assertThat(capturedFields)
-                .containsEntry("any-mdc-field", "1234-1234")
-                .containsKey("timestamp")
-                .containsEntry("logger_name", "uk.gov.hmcts.cp.integration.SpringLoggingIntegrationTest")
-                .containsEntry("thread_name", "Test worker")
-                .containsEntry("level", "INFO")
-                .containsEntry("message", "spring boot test message");
+        assertThat(capturedFields.get("any-mdc-field")).isEqualTo("1234-1234");
+        assertThat(capturedFields.get("timestamp")).isNotNull();
+        assertThat(capturedFields.get("logger_name")).isEqualTo("uk.gov.hmcts.cp.integration.SpringLoggingIntegrationTest");
+        assertThat(capturedFields.get("thread_name")).isEqualTo("Test worker");
+        assertThat(capturedFields.get("level")).isEqualTo("INFO");
+        assertThat(capturedFields.get("message").toString()).contains("spring boot test message\njava.lang.RuntimeException: MyException");
+        assertThat(capturedFields.get("message").toString()).contains("at uk.gov.hmcts.cp.integration.SpringLoggingIntegrationTest");
     }
 
     private ByteArrayOutputStream captureStdOut() {
         final ByteArrayOutputStream capturedStdOut = new ByteArrayOutputStream();
-        System.setOut(new PrintStream(capturedStdOut, true, StandardCharsets.UTF_8));
+        System.setOut(new PrintStream(capturedStdOut));
         return capturedStdOut;
     }
+
+    private void captureAsyncLogs() {
+        AsyncAppender asyncAppender = (AsyncAppender) ((ch.qos.logback.classic.Logger) LoggerFactory
+                .getLogger("ROOT"))
+                .getAppender("ASYNC_JSON");
+        asyncAppender.stop();
+    }
 }