Merge pull request #62 from SAP/fix/timestampconversion

Fix timestamp conversion to use current time

Author: nicklas-dohrn

cf-java-logging-support-log4j2/src/main/java/com/sap/hcp/cf/log4j2/converter/TimestampConverter.java

@@ -21,7 +21,7 @@ public static TimestampConverter newInstance(final String[] options) {
 
     @Override
     public void format(LogEvent event, StringBuilder toAppendTo) {
-        toAppendTo.append(System.nanoTime());
+        toAppendTo.append(System.currentTimeMillis() * 1000000);
     }
 
 }

cf-java-logging-support-log4j2/src/test/java/com/sap/hcp/cf/logging/common/TestAppLog.java

@@ -59,9 +59,9 @@ public void testMDC() {
         MDC.put(SOME_KEY, SOME_VALUE);
         MDC.put("testNumeric", "200");
         logMsg = "Running testMDC()";
-        long beforeTS = System.nanoTime();
+        long beforeTS = System.currentTimeMillis() * 1000000;
         LOGGER.info(logMsg);
-        long afterTS = System.nanoTime();
+        long afterTS = System.currentTimeMillis() * 1000000;
         assertThat(getMessage(), is(logMsg));
         assertThat(getField(Fields.COMPONENT_ID), is("-"));
         assertThat(getField(Fields.COMPONENT_NAME), is("-"));

cf-java-logging-support-logback/src/main/java/com/sap/hcp/cf/logback/converter/TimestampConverter.java

@@ -14,7 +14,7 @@ public class TimestampConverter extends ClassicConverter {
     @Override
     public String convert(ILoggingEvent event) {
         StringBuilder appendTo = new StringBuilder();
-        appendTo.append(System.nanoTime());
+        appendTo.append(System.currentTimeMillis() * 1000000);
         return appendTo.toString();
     }
 

cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logging/common/TestAppLog.java

@@ -61,7 +61,7 @@ public void testMDC() {
         MDC.put(SOME_KEY, SOME_VALUE);
         MDC.put("testNumeric", "200");
         logMsg = "Running testMDC()";
-        long beforeTS = System.nanoTime();
+        long beforeTS = System.currentTimeMillis() * 1000000;
         LOGGER.info(logMsg);
         assertThat(getMessage(), is(logMsg));
         assertThat(getField(Fields.COMPONENT_ID), is("-"));