Use Instant

Author: labkey-nicka

api/src/org/labkey/api/data/dialect/SqlDialect.java

@@ -80,9 +80,10 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.Duration;
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -867,25 +868,25 @@ public SQLFragment getNumericCast(SQLFragment expression)
      * @param arguments Arguments passed from the LK SQL
      * @return the dialect equivalent SQLFragrment
      */
-    public SQLFragment getGreatestAndLeastSQL(String method, SQLFragment... arguments)
-    {
-        throw new UnsupportedOperationException(getClass().getSimpleName() + " does not implement");
-    }
-
-    public boolean supportsIsNumeric()
-    {
-        return false;
-    }
-
-    public SQLFragment isNumericExpr(SQLFragment expression)
-    {
-        throw new UnsupportedOperationException(getClass().getSimpleName() + " does not implement");
-    }
-
-    public void handleCreateDatabaseException(SQLException e) throws ServletException
-    {
-        throw(new ServletException("Can't create database", e));
-    }
+    public SQLFragment getGreatestAndLeastSQL(String method, SQLFragment... arguments)
+    {
+        throw new UnsupportedOperationException(getClass().getSimpleName() + " does not implement");
+    }
+
+    public boolean supportsIsNumeric()
+    {
+        return false;
+    }
+
+    public SQLFragment isNumericExpr(SQLFragment expression)
+    {
+        throw new UnsupportedOperationException(getClass().getSimpleName() + " does not implement");
+    }
+
+    public void handleCreateDatabaseException(SQLException e) throws ServletException
+    {
+        throw(new ServletException("Can't create database", e));
+    }
 
     /**
      * Wrap one or more INSERT statements to allow explicit specification
@@ -2004,13 +2005,14 @@ public void addAdminWarningMessages(Warnings warnings, boolean showAllWarnings)
 
     public static ServerDatabaseTimeDifference getServerDatabaseTimeDifference(DbScope scope)
     {
-        LocalDateTime serverTime = LocalDateTime.now();
-        LocalDateTime databaseTime = new SqlSelector(scope, "SELECT CURRENT_TIMESTAMP").getObject(LocalDateTime.class);
+        // Compare Instants, not wall-clock values, so the skew is measured correctly even when the servers are in different time zones.
+        Instant serverTime = Instant.now();
+        Instant databaseTime = new SqlSelector(scope, "SELECT CURRENT_TIMESTAMP").getObject(Timestamp.class).toInstant();
 
         return new ServerDatabaseTimeDifference(serverTime, databaseTime);
     }
 
-    public record ServerDatabaseTimeDifference(LocalDateTime serverTime, LocalDateTime databaseTime)
+    public record ServerDatabaseTimeDifference(Instant serverTime, Instant databaseTime)
     {
         public long getSeconds()
         {
@@ -2476,7 +2478,7 @@ public void testProcedureIdentifierQuoting()
         @Test
         public void testServerDatabaseTimeDifference()
         {
-            LocalDateTime base = LocalDateTime.of(2026, 7, 6, 12, 0, 0);
+            Instant base = Instant.parse("2026-07-06T12:00:00Z");
 
             // Identical times: zero difference, no warning
             ServerDatabaseTimeDifference equal = new ServerDatabaseTimeDifference(base, base);

core/src/org/labkey/core/admin/admin.jsp

@@ -35,6 +35,7 @@
 <%@ page import="org.labkey.api.view.NavTree" %>
 <%@ page import="org.labkey.core.admin.AdminController" %>
 <%@ page import="java.text.DecimalFormat" %>
+<%@ page import="java.time.ZoneId" %>
 <%@ page import="java.time.format.DateTimeFormatter" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.Collection" %>
@@ -92,7 +93,7 @@
             <br/>
 <%
     row = 0;
-    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DateUtil.getJsonDateTimeFormatString());
+    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DateUtil.getJsonDateTimeFormatString()).withZone(ZoneId.systemDefault());
     String timeCellCls = "";
     HtmlString warning = HtmlString.EMPTY_STRING;
 
@@ -129,9 +130,9 @@
                 <tr class="<%=getShadeRowClass(row++)%>"><td>Working Dir</td><td><%=h(AdminBean.workingDir)%></td></tr>
                 <tr class="<%=getShadeRowClass(row++)%>"><td>Server GUID</td><td style="font-family:monospace"><%=h(AdminBean.serverGuid)%></td></tr>
                 <tr class="<%=getShadeRowClass(row++)%>"><td>Server Session GUID</td><td style="font-family:monospace"><%=h(AdminBean.serverSessionGuid)%></td></tr>
-                <tr class="<%=getShadeRowClass(row++)%>"><td>Server Startup Time</td><td class="<%=h(timeCellCls)%>"><%=h(AdminBean.serverStartupTime)%></td></tr>
-                <tr class="<%=getShadeRowClass(row++)%>"><td>Web Server Time</td><td class="<%=h(timeCellCls)%>"><%=h(timeDifference.serverTime().format(dateTimeFormatter))%><%=warning%></td></tr>
-                <tr class="<%=getShadeRowClass(row++)%>"><td>Database Server Time</td><td class="<%=h(timeCellCls)%>"><%=h(timeDifference.databaseTime().format(dateTimeFormatter))%><%=warning%></td></tr>
+                <tr class="<%=getShadeRowClass(row++)%>"><td>Server Startup Time</td><td><%=h(AdminBean.serverStartupTime)%></td></tr>
+                <tr class="<%=getShadeRowClass(row++)%>"><td>Web Server Time</td><td class="<%=h(timeCellCls)%>"><%=h(dateTimeFormatter.format(timeDifference.serverTime()))%><%=warning%></td></tr>
+                <tr class="<%=getShadeRowClass(row++)%>"><td>Database Server Time</td><td class="<%=h(timeCellCls)%>"><%=h(dateTimeFormatter.format(timeDifference.databaseTime()))%><%=warning%></td></tr>
             </table>
         </labkey:panel>
         <labkey:panel id="links" className="lk-admin-section">