diff --git a/src/main/java/com/splunk/logging/HttpEventCollectorEventInfo.java b/src/main/java/com/splunk/logging/HttpEventCollectorEventInfo.java index b78a53a9..7fd9f977 100644 --- a/src/main/java/com/splunk/logging/HttpEventCollectorEventInfo.java +++ b/src/main/java/com/splunk/logging/HttpEventCollectorEventInfo.java @@ -36,6 +36,7 @@ public class HttpEventCollectorEventInfo { /** * Create a new HttpEventCollectorEventInfo container + * @param timeMsSinceEpoch in milliseconds since "unix epoch" * @param severity of event * @param message is an event content * @param logger_name name of the logger @@ -45,6 +46,7 @@ public class HttpEventCollectorEventInfo { * @param marker event marker */ public HttpEventCollectorEventInfo( + final long timeMsSinceEpoch, final String severity, final String message, final String logger_name, @@ -53,7 +55,7 @@ public HttpEventCollectorEventInfo( final String exception_message, final Serializable marker ) { - this.time = System.currentTimeMillis() / 1000.0; + this.time = timeMsSinceEpoch / 1000.0; this.severity = severity; this.message = message; this.logger_name = logger_name; diff --git a/src/main/java/com/splunk/logging/HttpEventCollectorLog4jAppender.java b/src/main/java/com/splunk/logging/HttpEventCollectorLog4jAppender.java index dca76120..71881fdc 100644 --- a/src/main/java/com/splunk/logging/HttpEventCollectorLog4jAppender.java +++ b/src/main/java/com/splunk/logging/HttpEventCollectorLog4jAppender.java @@ -233,6 +233,7 @@ public void append(final LogEvent event) { // if an exception was thrown this.sender.send( + event.getTimeMillis(), event.getLevel().toString(), getLayout().toSerializable(event).toString(), includeLoggerName ? event.getLoggerName() : null, diff --git a/src/main/java/com/splunk/logging/HttpEventCollectorLogbackAppender.java b/src/main/java/com/splunk/logging/HttpEventCollectorLogbackAppender.java index fe786299..1a90a919 100644 --- a/src/main/java/com/splunk/logging/HttpEventCollectorLogbackAppender.java +++ b/src/main/java/com/splunk/logging/HttpEventCollectorLogbackAppender.java @@ -145,6 +145,7 @@ private void sendEvent(ILoggingEvent event) { MarkerConverter c = new MarkerConverter(); if (this.started) { this.sender.send( + event.getTimeStamp(), event.getLevel().toString(), _layout.doLayout((E) event), _includeLoggerName ? event.getLoggerName() : null, diff --git a/src/main/java/com/splunk/logging/HttpEventCollectorLoggingHandler.java b/src/main/java/com/splunk/logging/HttpEventCollectorLoggingHandler.java index 34826ded..c2e85b16 100644 --- a/src/main/java/com/splunk/logging/HttpEventCollectorLoggingHandler.java +++ b/src/main/java/com/splunk/logging/HttpEventCollectorLoggingHandler.java @@ -223,6 +223,7 @@ public HttpEventCollectorLoggingHandler() { @Override public void publish(LogRecord record) { this.sender.send( + record.getMillis(), record.getLevel().toString(), record.getMessage(), includeLoggerName ? record.getLoggerName() : null, diff --git a/src/main/java/com/splunk/logging/HttpEventCollectorSender.java b/src/main/java/com/splunk/logging/HttpEventCollectorSender.java index 36fbcbd9..960640f5 100644 --- a/src/main/java/com/splunk/logging/HttpEventCollectorSender.java +++ b/src/main/java/com/splunk/logging/HttpEventCollectorSender.java @@ -167,6 +167,7 @@ public void addMiddleware(HttpEventCollectorMiddleware.HttpSenderMiddleware midd * @param message event text */ public synchronized void send( + final long timeMsSinceEpoch, final String severity, final String message, final String logger_name, @@ -177,7 +178,7 @@ public synchronized void send( ) { // create event info container and add it to the batch HttpEventCollectorEventInfo eventInfo = - new HttpEventCollectorEventInfo(severity, message, logger_name, thread_name, properties, exception_message, marker); + new HttpEventCollectorEventInfo(timeMsSinceEpoch, severity, message, logger_name, thread_name, properties, exception_message, marker); eventsBatch.add(eventInfo); eventsBatchSize += severity.length() + message.length(); if (eventsBatch.size() >= maxEventsBatchCount || eventsBatchSize > maxEventsBatchSize) { @@ -190,7 +191,7 @@ public synchronized void send( * @param message event text */ public synchronized void send(final String message) { - send("", message, "", "", null, null, ""); + send(System.currentTimeMillis(), "", message, "", "", null, null, ""); } /**