Skip to content

Commit 1b66122

Browse files
authored
Add ecs.version (#109)
closes #91
1 parent 4772ad8 commit 1b66122

File tree

7 files changed

+10
-0
lines changed

7 files changed

+10
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ public static void serializeObjectStart(StringBuilder builder, long timeMillis)
4747
builder.append("\", ");
4848
}
4949

50+
public static void serializeEcsVersion(StringBuilder builder) {
51+
builder.append("\"ecs.version\": \"1.2.0\",");
52+
}
53+
5054
public static void serializeObjectEnd(StringBuilder builder) {
5155
removeIfEndsWith(builder, ",");
5256
builder.append('}');

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ void testMetadata() throws Exception {
5151
assertThat(getLastLogLine().get("log.level").textValue()).isIn("DEBUG", "FINE");
5252
assertThat(getLastLogLine().get("log.logger")).isNotNull();
5353
assertThat(getLastLogLine().get("event.dataset").textValue()).isEqualTo("testdataset.log");
54+
assertThat(getLastLogLine().get("ecs.version").textValue()).isEqualTo("1.2.0");
5455
}
5556

5657
@Test

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public String format(ExtLogRecord record) {
5050
EcsJsonSerializer.serializeObjectStart(builder, record.getMillis());
5151
EcsJsonSerializer.serializeLogLevel(builder, record.getLevel().getName());
5252
EcsJsonSerializer.serializeFormattedMessage(builder, record.getFormattedMessage());
53+
EcsJsonSerializer.serializeEcsVersion(builder);
5354
EcsJsonSerializer.serializeServiceName(builder, serviceName);
5455
EcsJsonSerializer.serializeEventDataset(builder, eventDataset);
5556
EcsJsonSerializer.serializeThreadName(builder, record.getThreadName());

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
@@ -58,6 +58,7 @@ public String format(final LogRecord record) {
5858
EcsJsonSerializer.serializeObjectStart(builder, record.getMillis());
5959
EcsJsonSerializer.serializeLogLevel(builder, record.getLevel().getName());
6060
EcsJsonSerializer.serializeFormattedMessage(builder, super.formatMessage(record));
61+
EcsJsonSerializer.serializeEcsVersion(builder);
6162
EcsJsonSerializer.serializeMDC(builder, mdcSupplier.getMDC());
6263
EcsJsonSerializer.serializeServiceName(builder, serviceName);
6364
EcsJsonSerializer.serializeEventDataset(builder, eventDataset);

log4j-ecs-layout/src/main/java/co/elastic/logging/log4j/EcsLayout.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public String format(LoggingEvent event) {
4545
EcsJsonSerializer.serializeObjectStart(builder, event.timeStamp);
4646
EcsJsonSerializer.serializeLogLevel(builder, event.level.toString());
4747
EcsJsonSerializer.serializeFormattedMessage(builder, event.getRenderedMessage());
48+
EcsJsonSerializer.serializeEcsVersion(builder);
4849
EcsJsonSerializer.serializeServiceName(builder, serviceName);
4950
EcsJsonSerializer.serializeEventDataset(builder, eventDataset);
5051
EcsJsonSerializer.serializeThreadName(builder, event.getThreadName());

log4j2-ecs-layout/src/main/java/co/elastic/logging/log4j2/EcsLayout.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ private StringBuilder toText(LogEvent event, StringBuilder builder, boolean gcFr
123123
EcsJsonSerializer.serializeObjectStart(builder, event.getTimeMillis());
124124
EcsJsonSerializer.serializeLogLevel(builder, event.getLevel().toString());
125125
serializeMessage(builder, gcFree, event.getMessage(), event.getThrown());
126+
EcsJsonSerializer.serializeEcsVersion(builder);
126127
EcsJsonSerializer.serializeServiceName(builder, serviceName);
127128
EcsJsonSerializer.serializeEventDataset(builder, eventDataset);
128129
EcsJsonSerializer.serializeThreadName(builder, event.getThreadName());

logback-ecs-encoder/src/main/java/co/elastic/logging/logback/EcsEncoder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public byte[] encode(ILoggingEvent event) {
9393
EcsJsonSerializer.serializeObjectStart(builder, event.getTimeStamp());
9494
EcsJsonSerializer.serializeLogLevel(builder, event.getLevel().toString());
9595
EcsJsonSerializer.serializeFormattedMessage(builder, event.getFormattedMessage());
96+
EcsJsonSerializer.serializeEcsVersion(builder);
9697
serializeMarkers(event, builder);
9798
EcsJsonSerializer.serializeServiceName(builder, serviceName);
9899
EcsJsonSerializer.serializeEventDataset(builder, eventDataset);

0 commit comments

Comments
 (0)