Merge branch 'develop' into grails7

# Conflicts:
#	CHANGELOG.md

Author: lbwexler

CHANGELOG.md

@@ -21,6 +21,9 @@ part of the Apache Foundation.  The main required changes to applications are th
 See the grails documentation at  https://docs.grails.org/7.0.0-RC2/guide/upgrading.html#upgrading60x
 for more information.
 
+### 🐞 Bug Fixes
+* Restore display of Timers in Service AdminStats.
+
 
 ## 33.0.0 - 2025-09-26
 

grails-app/services/io/xh/hoist/admin/MemoryMonitoringService.groovy

@@ -20,6 +20,7 @@ import static io.xh.hoist.json.JSONParser.parseObject
 import static io.xh.hoist.util.DateTimeUtils.MINUTES
 import static io.xh.hoist.util.DateTimeUtils.intervalElapsed
 import static io.xh.hoist.util.Utils.getAppEnvironment
+import static io.xh.hoist.util.Utils.getIsLocalDevelopment
 import static io.xh.hoist.util.Utils.isProduction
 import static io.xh.hoist.cluster.ClusterService.startupTime
 import static io.xh.hoist.util.DateTimeUtils.HOURS
@@ -39,7 +40,7 @@ class MemoryMonitoringService extends BaseService {
     private Map<Long, Map> _snapshots = new ConcurrentHashMap()
     private Date _lastInfoLogged
     private final String blobOwner = 'xhMemoryMonitoringService'
-    private final static String blobType =  isProduction ? 'xhMemorySnapshots' : "xhMemorySnapshots_$appEnvironment"
+    private final static String blobType = isProduction ? 'xhMemorySnapshots' : "xhMemorySnapshots_$appEnvironment"
 
     void init() {
         createTimer(
@@ -111,7 +112,7 @@ class MemoryMonitoringService extends BaseService {
             logDebug(newSnap)
         }
 
-        if (config.preservePastInstances) persistSnapshots()
+        if (preservePastInstances) persistSnapshots()
 
         return newSnap
     }
@@ -132,7 +133,8 @@ class MemoryMonitoringService extends BaseService {
      * Get list of past instances for which snapshots are available.
      */
     List<Map> availablePastInstances() {
-        if (!config.preservePastInstances) return []
+        if (!preservePastInstances) return []
+
         jsonBlobService
             .list(blobType, blobOwner)
             .findAll { !clusterService.isMember(it.name) }
@@ -200,14 +202,6 @@ class MemoryMonitoringService extends BaseService {
         ]
     }
 
-    private Map getConfig() {
-        return configService.getMap('xhMemoryMonitoringConfig')
-    }
-
-    private double roundTo2DP(v) {
-        return Math.round(v * 100) / 100
-    }
-
     private void persistSnapshots() {
         try {
             jsonBlobService.createOrUpdate(
@@ -224,8 +218,7 @@ class MemoryMonitoringService extends BaseService {
     @Transactional
     private cullPersisted() {
         def all = jsonBlobService.list(blobType, blobOwner).sort { it.lastUpdated },
-            maxKeep = config.maxPastInstances != null ? Math.max(config.maxPastInstances, 0) : 5,
-            toDelete = all.dropRight(maxKeep)
+            toDelete = all.dropRight(maxPastInstances)
 
         if (toDelete) {
             withInfo(['Deleting memory snapshots', [count: toDelete.size()]]) {
@@ -234,6 +227,22 @@ class MemoryMonitoringService extends BaseService {
         }
     }
 
+    private Map getConfig() {
+        return configService.getMap('xhMemoryMonitoringConfig')
+    }
+
+    private boolean getPreservePastInstances() {
+        return config.preservePastInstances && !getIsLocalDevelopment()
+    }
+
+    private int getMaxPastInstances() {
+        return config.maxPastInstances != null ? Math.max(config.maxPastInstances as int, 0) : 5
+    }
+
+    private double roundTo2DP(v) {
+        return Math.round(v * 100) / 100
+    }
+
     void clearCaches() {
         _snapshots.clear()
         super.clearCaches()

src/main/groovy/io/xh/hoist/util/Timer.groovy

@@ -10,6 +10,7 @@ package io.xh.hoist.util
 import com.hazelcast.replicatedmap.ReplicatedMap
 import groovy.transform.NamedParam
 import groovy.transform.NamedVariant
+import io.xh.hoist.AdminStats
 import io.xh.hoist.cluster.ClusterService
 import io.xh.hoist.log.LogSupport
 import org.slf4j.Logger
@@ -45,7 +46,7 @@ import static org.slf4j.LoggerFactory.getLogger
  * A common pattern would be to have the primary instance run a Timer-based job to load data into
  * a cache, with the cache then replicated across the cluster.
  */
-class Timer implements LogSupport {
+class Timer implements LogSupport, AdminStats {
 
     private static Long CONFIG_INTERVAL = 15 * SECONDS
     private static boolean shutdownInProgress = false
@@ -224,16 +225,19 @@ class Timer implements LogSupport {
     Map getAdminStats() {
         [
             name      : name,
-            type      : 'Timer' + (primaryOnly ? ' (primary only)' : ''),
+            type      : 'Timer',
+            primaryOnly: primaryOnly,
             intervalMs: intervalMs,
             isRunning : isRunning,
             startTime : isRunning ? _lastRunStarted : null,
             last      : _lastRunStats
         ].findAll { it.value != null }
     }
 
-
-    //------------------------
+    List<String> getComparableAdminStats() {
+        return []
+    }
+//------------------------
     // Implementation
     //------------------------
     private void doRun() {