Fix tests

Author: felixbarny

ecs-logging-core/src/test/java/co/elastic/logging/AbstractEcsLoggingTest.java

@@ -96,9 +96,6 @@ void validateLog(JsonNode logLine) {
             validateRequiredField(logLine, specFieldName, specForField.get("required").booleanValue());
             if (fieldInLog != null) {
                 validateIndex(logLine, logFieldNames, specFieldName, specForField.get("index"));
-                if (specForField.has("nesting_allowed") && !specForField.get("nesting_allowed").asBoolean(true)) {
-                    assertThat(logLine.at(specFieldName)).isNull();
-                }
                 validateType(fieldInLog, specForField.get("type").textValue());
             }
         }
@@ -125,7 +122,9 @@ private void validateType(JsonNode fieldInLog, String type) {
             case "datetime":
                 assertThatCode(() -> Instant.parse(fieldInLog.textValue())).doesNotThrowAnyException();
             case "string":
-                assertThat(fieldInLog.isTextual()).isTrue();
+                assertThat(fieldInLog.isTextual())
+                        .describedAs("%s is not a %s", fieldInLog, type)
+                        .isTrue();
         }
     }
 
@@ -180,13 +179,11 @@ void testMdc() throws Exception {
     @Test
     void testLogException() throws Exception {
         error("test", new RuntimeException("test"));
-        assertThat(getAndValidateLastLogLine().get("log.level").textValue()).isEqualTo("ERROR");
-        assertThat(getAndValidateLastLogLine().get("error.message").textValue()).isEqualTo("test");
-        assertThat(getAndValidateLastLogLine().get("error.type").textValue()).isEqualTo(RuntimeException.class.getName());
-        String stackTrace = StreamSupport.stream(getAndValidateLastLogLine().get("error.stack_trace").spliterator(), false)
-                .map(JsonNode::textValue)
-                .collect(Collectors.joining("\n", "", "\n"));
-        assertThat(stackTrace).contains("at co.elastic.logging.AbstractEcsLoggingTest.testLogException");
+        JsonNode log = getAndValidateLastLogLine();
+        assertThat(log.get("log.level").textValue()).isIn("ERROR", "SEVERE");
+        assertThat(log.get("error.message").textValue()).isEqualTo("test");
+        assertThat(log.get("error.type").textValue()).isEqualTo(RuntimeException.class.getName());
+        assertThat(log.get("error.stack_trace").textValue()).contains("at co.elastic.logging.AbstractEcsLoggingTest.testLogException");
     }
 
     @Test

jboss-logmanager-ecs-formatter/src/test/java/co/elastic/logging/jboss/logmanager/JBossLogManagerTest.java

@@ -88,7 +88,6 @@ public JsonNode getLastLogLine() throws IOException {
     @BeforeEach
     void setUp() {
         formatter.setIncludeOrigin(true);
-        formatter.setStackTraceAsArray(true);
         formatter.setServiceName("test");
         formatter.setEventDataset("testdataset.log");
         formatter.setAdditionalFields("key1=value1,key2=value2");

jul-ecs-formatter/src/test/java/co/elastic/logging/jul/JulLoggingTest.java

@@ -113,7 +113,6 @@ void setUp() {
         clearHandlers();
 
         formatter.setIncludeOrigin(true);
-        formatter.setStackTraceAsArray(true);
         formatter.setServiceName("test");
         formatter.setEventDataset("testdataset.log");
         formatter.setAdditionalFields("key1=value1,key2=value2");
@@ -125,18 +124,6 @@ void setUp() {
         logger.setLevel(Level.ALL);
     }
 
-    @Test
-    void testLogException() throws Exception {
-        error("test", new RuntimeException("test"));
-        assertThat(getAndValidateLastLogLine().get("log.level").textValue()).isEqualTo("SEVERE");
-        assertThat(getAndValidateLastLogLine().get("error.message").textValue()).isEqualTo("test");
-        assertThat(getAndValidateLastLogLine().get("error.type").textValue()).isEqualTo(RuntimeException.class.getName());
-        String stackTrace = StreamSupport.stream(getAndValidateLastLogLine().get("error.stack_trace").spliterator(), false)
-                .map(JsonNode::textValue)
-                .collect(Collectors.joining("\n", "", "\n"));
-        assertThat(stackTrace).contains("at co.elastic.logging.jul.JulLoggingTest.testLogException");
-    }
-
     @Test
     void testLogOrigin() throws Exception {
         debug("test");

log4j-ecs-layout/src/test/java/co/elastic/logging/log4j/Log4jEcsLayoutTest.java

@@ -51,7 +51,6 @@ void setUp() {
         logger.addAppender(appender);
         ecsLayout = new EcsLayout();
         ecsLayout.setServiceName("test");
-        ecsLayout.setStackTraceAsArray(true);
         ecsLayout.setIncludeOrigin(true);
         ecsLayout.setEventDataset("testdataset.log");
         ecsLayout.activateOptions();

log4j-ecs-layout/src/test/resources/log4j.xml

@@ -5,7 +5,6 @@
         <layout class="co.elastic.logging.log4j.EcsLayout">
             <param name="serviceName" value="test"/>
             <param name="eventDataset" value="testdataset.log"/>
-            <param name="stackTraceAsArray" value="true"/>
             <param name="includeOrigin" value="true"/>
             <param name="additionalField" value="key1=value1"/>
             <param name="additionalField" value="key2=value2"/>

log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java

@@ -69,7 +69,6 @@ void setUp() {
                 .setServiceName("test")
                 .setIncludeMarkers(true)
                 .setIncludeOrigin(true)
-                .setStackTraceAsArray(true)
                 .setEventDataset("testdataset.log")
                 .setAdditionalFields(new KeyValuePair[]{
                         new KeyValuePair("cluster.uuid", "9fe9134b-20b0-465e-acf9-8cc09ac9053b"),

log4j2-ecs-layout/src/test/resources/log4j2-test.xml

@@ -5,8 +5,7 @@
     </Properties>
     <Appenders>
         <List name="TestAppender">
-            <EcsLayout serviceName="test" includeMarkers="true" includeOrigin="true" stackTraceAsArray="true"
-                       eventDataset="testdataset.log">
+            <EcsLayout serviceName="test" includeMarkers="true" includeOrigin="true" eventDataset="testdataset.log">
                 <KeyValuePair key="cluster.uuid" value="9fe9134b-20b0-465e-acf9-8cc09ac9053b"/>
                 <KeyValuePair key="node.id" value="${node.id}"/>
                 <KeyValuePair key="empty" value="${empty}"/>

logback-ecs-encoder/src/test/java/co/elastic/logging/logback/EcsEncoderTest.java

@@ -45,7 +45,6 @@ void setUp() {
         EcsEncoder ecsEncoder = new EcsEncoder();
         ecsEncoder.setServiceName("test");
         ecsEncoder.setIncludeMarkers(true);
-        ecsEncoder.setStackTraceAsArray(true);
         ecsEncoder.setIncludeOrigin(true);
         ecsEncoder.addAdditionalField(new AdditionalField("key1", "value1"));
         ecsEncoder.addAdditionalField(new AdditionalField("key2", "value2"));

logback-ecs-encoder/src/test/resources/logback-config.xml

@@ -5,7 +5,6 @@
             <serviceName>test</serviceName>
             <includeMarkers>true</includeMarkers>
             <includeOrigin>true</includeOrigin>
-            <stackTraceAsArray>true</stackTraceAsArray>
             <topLevelLabel>top_level</topLevelLabel>
             <eventDataset>testdataset.log</eventDataset>
             <additionalField>