diff --git a/ecs-logging-core/src/main/java/co/elastic/logging/AdditionalField.java b/ecs-logging-core/src/main/java/co/elastic/logging/AdditionalField.java index 16c1ad06..9afdaa51 100644 --- a/ecs-logging-core/src/main/java/co/elastic/logging/AdditionalField.java +++ b/ecs-logging-core/src/main/java/co/elastic/logging/AdditionalField.java @@ -25,6 +25,7 @@ package co.elastic.logging; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class AdditionalField { @@ -40,6 +41,9 @@ public AdditionalField(String key, String value) { } public static List parse(String additionalFields) { + if (additionalFields == null) { + return Collections.emptyList(); + } String[] split = additionalFields.split(","); ArrayList result = new ArrayList(split.length); for (String additionalField : split) { diff --git a/jul-ecs-formatter/src/main/java/co/elastic/logging/jul/EcsFormatter.java b/jul-ecs-formatter/src/main/java/co/elastic/logging/jul/EcsFormatter.java index 73e8cb7e..5362d74d 100644 --- a/jul-ecs-formatter/src/main/java/co/elastic/logging/jul/EcsFormatter.java +++ b/jul-ecs-formatter/src/main/java/co/elastic/logging/jul/EcsFormatter.java @@ -54,6 +54,7 @@ public EcsFormatter() { .getBoolean(getProperty("co.elastic.logging.jul.EcsFormatter.stackTraceAsArray", "false")); eventDataset = getProperty("co.elastic.logging.jul.EcsFormatter.eventDataset", null); eventDataset = EcsJsonSerializer.computeEventDataset(eventDataset, serviceName); + setAdditionalFields(getProperty("co.elastic.logging.jul.EcsFormatter.additionalFields", null)); } @Override