Skip to content

Commit 9d19a70

Browse files
authored
Make additionalFields configurable for JUL (#118)
1 parent 16339a5 commit 9d19a70

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

ecs-logging-core/src/main/java/co/elastic/logging/AdditionalField.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
package co.elastic.logging;
2626

2727
import java.util.ArrayList;
28+
import java.util.Collections;
2829
import java.util.List;
2930

3031
public class AdditionalField {
@@ -40,6 +41,9 @@ public AdditionalField(String key, String value) {
4041
}
4142

4243
public static List<AdditionalField> parse(String additionalFields) {
44+
if (additionalFields == null) {
45+
return Collections.emptyList();
46+
}
4347
String[] split = additionalFields.split(",");
4448
ArrayList<AdditionalField> result = new ArrayList<AdditionalField>(split.length);
4549
for (String additionalField : split) {

jul-ecs-formatter/src/main/java/co/elastic/logging/jul/EcsFormatter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public EcsFormatter() {
5454
.getBoolean(getProperty("co.elastic.logging.jul.EcsFormatter.stackTraceAsArray", "false"));
5555
eventDataset = getProperty("co.elastic.logging.jul.EcsFormatter.eventDataset", null);
5656
eventDataset = EcsJsonSerializer.computeEventDataset(eventDataset, serviceName);
57+
setAdditionalFields(getProperty("co.elastic.logging.jul.EcsFormatter.additionalFields", null));
5758
}
5859

5960
@Override

0 commit comments

Comments
 (0)