Updates from review.

Now the startupTime is a ZonedDateTime, which takes into account daylight savings.

Signed-off-by: Simone Bordet <[email protected]>

Author: sbordet

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java

@@ -20,7 +20,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.time.Duration;
-import java.time.Instant;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -79,7 +79,6 @@ public class Server extends Handler.Wrapper implements Attributes
     private static final Logger LOG = LoggerFactory.getLogger(Server.class);
     private static final String __serverInfo = "jetty/" + Server.getVersion();
 
-    private final Instant startupInstant = Instant.now();
     private final AttributeContainerMap _attributes = new AttributeContainerMap();
     private final ThreadPool _threadPool;
     private final Scheduler _scheduler;
@@ -89,6 +88,7 @@ public class Server extends Handler.Wrapper implements Attributes
     private final AutoLock _dateLock = new AutoLock();
     private final MimeTypes.Mutable _mimeTypes = new MimeTypes.Mutable();
     private String _serverInfo = __serverInfo;
+    private ZonedDateTime startupTime;
     private boolean _openEarly = true;
     private boolean _stopAtShutdown;
     private boolean _dumpAfterStart;
@@ -549,28 +549,30 @@ public HttpField getDateField()
     }
 
     /**
-     * @return the UTC startup instant
+     * @return the startup date and time in the system timezone, or {@code null} if not started
      */
-    public Instant getStartupInstant()
+    public ZonedDateTime getStartupTime()
     {
-        return startupInstant;
+        return startupTime;
     }
 
     /**
-     * @return the time, in milliseconds, since this Server was created.
+     * @return the time, in milliseconds, since this Server was started
      */
     public long getUptimeMillis()
     {
-        return Duration.between(startupInstant, Instant.now()).toMillis();
+        return startupTime == null ? 0 : Duration.between(startupTime, ZonedDateTime.now()).toMillis();
     }
 
     @Override
     protected void doStart() throws Exception
     {
         try
         {
-            //If the Server should be stopped when the jvm exits, register
-            //with the shutdown handler thread.
+            startupTime = ZonedDateTime.now();
+
+            // If the Server should be stopped when the jvm exits,
+            // register with the shutdown handler thread.
             if (getStopAtShutdown())
                 ShutdownThread.register(this);
 
@@ -697,6 +699,8 @@ protected void doStop() throws Exception
         if (LOG.isDebugEnabled())
             LOG.debug("doStop {}", this);
 
+        startupTime = null;
+
         Throwable multiException = null;
 
         if (getStopTimeout() > 0)

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/jmx/ServerMBean.java

@@ -62,10 +62,10 @@ public List<ContextHandler> getContexts()
         return getManagedObject().getDescendants(ContextHandler.class);
     }
 
-    @ManagedAttribute("The UTC startup instant")
+    @ManagedAttribute("The startup date time in the system timezone")
     public String getStartupTime()
     {
-        return getManagedObject().getStartupInstant().toString();
+        return String.valueOf(getManagedObject().getStartupTime());
     }
 
     @ManagedAttribute("The uptime duration in d:HH:mm:ss.SSS")

jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Uptime.java

@@ -19,7 +19,7 @@
 /**
  * Provide for a Uptime class that is compatible with Android, GAE, and the new Java 8 compact profiles
  *
- * @deprecated no replacement, will be removed
+ * @deprecated no replacement, will be removed, functionality moved to the {@code Server} class.
  */
 @Deprecated(forRemoval = true, since = "12.1.4")
 public class Uptime