fix

Author: jeromevdl

powertools-logging/powertools-logging-log4j/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/PowertoolsResolver.java

@@ -259,7 +259,6 @@ public void resolve(LogEvent value, JsonWriter jsonWriter) {
 
     @Override
     public boolean isResolvable(LogEvent value) {
-        ReadOnlyStringMap contextData = value.getContextData();
-        return null != contextData && !contextData.isEmpty() && internalResolver.isResolvable(value);
+        return value != null && value.getContextData() != null && internalResolver.isResolvable(value);
     }
 }

powertools-logging/powertools-logging-log4j/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/PowertoolsMessageResolverTest.java

@@ -81,10 +81,12 @@ void shouldLogJsonMessageWithoutEscapedStrings() {
 
         // THEN
         File logFile = new File("target/logfile.json");
-        assertThat(contentOf(logFile)).contains("\"message\":{\"messageId\":\"1212abcd\",\"receiptHandle\":null,\"body\":\"plop\",\"md5OfBody\":null,\"md5OfMessageAttributes\":null,\"eventSourceArn\":null,\"eventSource\":\"eb\",\"awsRegion\":\"eu-west-1\",\"attributes\":null,\"messageAttributes\":{\"keyAttribute\":{\"stringValue\":null,\"binaryValue\":null,\"stringListValues\":[\"val1\",\"val2\",\"val3\"],\"binaryListValues\":null,\"dataType\":null}}}");
+        assertThat(contentOf(logFile))
+                .contains("\"message\":{\"messageId\":\"1212abcd\",\"receiptHandle\":null,\"body\":\"plop\",\"md5OfBody\":null,\"md5OfMessageAttributes\":null,\"eventSourceArn\":null,\"eventSource\":\"eb\",\"awsRegion\":\"eu-west-1\",\"attributes\":null,\"messageAttributes\":{\"keyAttribute\":{\"stringValue\":null,\"binaryValue\":null,\"stringListValues\":[\"val1\",\"val2\",\"val3\"],\"binaryListValues\":null,\"dataType\":null}}}")
+                .contains("\"message\":\"1212abcd\"")
+                .contains("\"message\":\"Message body = plop and id = \\\"1212abcd\\\"\"");
     }
 
-
     @Test
     void shouldLogStringMessageWhenNotJson() {
         // GIVEN

powertools-logging/powertools-logging-log4j/src/test/java/software/amazon/lambda/powertools/logging/internal/handler/PowertoolsJsonMessage.java

@@ -31,6 +31,8 @@ public class PowertoolsJsonMessage implements RequestHandler<SQSEvent.SQSMessage
     public String handleRequest(SQSEvent.SQSMessage input, Context context) {
         try {
             LOG.debug(JsonConfig.get().getObjectMapper().writeValueAsString(input));
+            LOG.debug("{}", input.getMessageId());
+            LOG.warn("Message body = {} and id = \"{}\"", input.getBody(), input.getMessageId());
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }