GH-534 LogRecord: read time from 'instant' field

Author: thurka

visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/TimeDetailsProvider.java

@@ -46,11 +46,20 @@ public TimeDetailsProvider() {
 
     public String getDetailsString(String className, Instance instance) {
         if (INSTANT_MASK.equals(className)) {
-            long seconds = DetailsUtils.getLongFieldValue(instance, "seconds", -1);     // NOI18N
-            int nanos = DetailsUtils.getIntFieldValue(instance, "nanos", -1);      // NOI18N
+            Instant instant = getInstant(instance);
+            if (instant != null) return instant.toString();
+        }
+        return null;
+    }
+
+    static Instant getInstant(Object instant) {
+        if (instant instanceof Instance) {
+            Instance instantObj = (Instance) instant;
+            long seconds = DetailsUtils.getLongFieldValue(instantObj, "seconds", -1);     // NOI18N
+            int nanos = DetailsUtils.getIntFieldValue(instantObj, "nanos", -1);      // NOI18N
 
             if (seconds != -1 && nanos != -1) {
-                return Instant.ofEpochSecond(seconds, nanos).toString();
+                return Instant.ofEpochSecond(seconds, nanos);
             }
         }
         return null;

visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/UtilDetailsProvider.java

@@ -24,6 +24,7 @@
  */
 package org.graalvm.visualvm.lib.profiler.heapwalk.details.jdk;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -265,11 +266,7 @@ record = rec;
 
         @Override
         public long getMillis() {
-            Object time = record.getValueOfField("millis");
-            if (time instanceof Number) {
-                return ((Number)time).longValue();
-            }
-            return 0;
+            return getInstant().toEpochMilli();
         }
 
         @Override
@@ -292,6 +289,19 @@ public String getMessage() {
             return DetailsUtils.getInstanceFieldString(record, "message");    // NOI18N
         }
 
+        // @Override since JDK 9
+        public Instant getInstant() {
+            Object instant = record.getValueOfField("instant");     // NOI18N
+            if (instant instanceof Instance) {
+                return TimeDetailsProvider.getInstant(instant);
+            }
+            Object time = record.getValueOfField("millis");
+            if (time instanceof Number) {
+                return Instant.ofEpochMilli(((Number)time).longValue());
+            }
+            return Instant.EPOCH;
+        }
+
         @Override
         public Object[] getParameters() {
             Object pars = record.getValueOfField("parameters");