diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-16 16:47:23 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-16 16:47:23 +0100 |
| commit | fe5108ec6cb8bb921e7617c572d21d4c19f6e9c8 (patch) | |
| tree | 374777bacd0472ad60bc775763f427d9c9312414 /container-accesslogging | |
| parent | 7a6772d914b0de0ecf683f1233c349e34067ec37 (diff) | |
Also log timestamp in human-friendly format
Diffstat (limited to 'container-accesslogging')
| -rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java | 3 | ||||
| -rw-r--r-- | container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java index a328f0d34bd..4e9ccc341b8 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/JSONFormatter.java @@ -11,6 +11,7 @@ import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; import java.net.URI; +import java.time.Instant; import java.util.List; import java.util.Map; import java.util.Objects; @@ -47,6 +48,8 @@ public class JSONFormatter { generator.writeStartObject(); generator.writeStringField("ip", accessLogEntry.getIpV4Address()); generator.writeNumberField("time", toTimestampInSeconds(accessLogEntry.getTimeStampMillis())); + generator.writeStringField("time-iso8601", + Instant.ofEpochMilli(accessLogEntry.getTimeStampMillis()).toString()); generator.writeNumberField("duration", durationAsSeconds(accessLogEntry.getDurationBetweenRequestResponseMillis())); generator.writeNumberField("responsesize", accessLogEntry.getReturnedContentSize()); diff --git a/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java index ae27d7b1814..7f81a3568dd 100644 --- a/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java +++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java @@ -40,6 +40,7 @@ public class JSONLogTestCase extends junit.framework.TestCase { String expectedOutput = "{\"ip\":\"152.200.54.243\"," + "\"time\":920880005.023," + + "\"time-iso8601\":\"1999-03-08T08:00:05.023Z\"," + "\"duration\":0.122," + "\"responsesize\":9875," + "\"code\":200," + @@ -68,6 +69,7 @@ public class JSONLogTestCase extends junit.framework.TestCase { String expectedOutput = "{\"ip\":\"152.200.54.243\"," + "\"time\":920880005.023," + + "\"time-iso8601\":\"1999-03-08T08:00:05.023Z\"," + "\"duration\":0.122," + "\"responsesize\":9875," + "\"code\":200," + @@ -100,6 +102,7 @@ public class JSONLogTestCase extends junit.framework.TestCase { String expectedOutput = "{\"ip\":\"152.200.54.243\"," + "\"time\":920880005.023," + + "\"time-iso8601\":\"1999-03-08T08:00:05.023Z\"," + "\"duration\":0.122," + "\"responsesize\":9875," + "\"code\":200," + @@ -125,6 +128,7 @@ public class JSONLogTestCase extends junit.framework.TestCase { expectedOutput = "{\"ip\":\"152.200.54.243\"," + "\"time\":920880005.023," + + "\"time-iso8601\":\"1999-03-08T08:00:05.023Z\"," + "\"duration\":0.122," + "\"responsesize\":9875," + "\"code\":200," + @@ -171,6 +175,7 @@ public class JSONLogTestCase extends junit.framework.TestCase { String expectedOutput = "{\"ip\":\"152.200.54.243\"," + "\"time\":920880005.023," + + "\"time-iso8601\":\"1999-03-08T08:00:05.023Z\"," + "\"duration\":0.122," + "\"responsesize\":9875," + "\"code\":200," + |