AMQ-9552: Add metric lastMessageTimestamp to StatisticsBroker based o…

…n lastSampleTime of metric enqueues (if hasUpdated)
apache · Aug 23, 2024 · 4c307df · 4c307df
1 parent e45ee4a
commit 4c307df
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java b/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
@@ -160,6 +160,11 @@ else if (dest instanceof Topic) {
                                 tempFirstMessage.clear();
                             }
                         }
+                        if ( stats.getEnqueues().hasUpdated() ) {
+                            // NOTICE: Client-side, you may get the broker "now" Timestamp by msg.getJMSTimestamp()
+                            // This allows for calculating inactivity.
+                            statsMessage.setLong("lastMessageTimestamp", stats.getEnqueues().getLastSampleTime());
+                        }
                         statsMessage.setJMSCorrelationID(messageSend.getCorrelationId());
                         sendStats(producerExchange.getConnectionContext(), statsMessage, replyTo);
                     }

diff --git a/activemq-client/src/main/java/org/apache/activemq/management/StatisticImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/StatisticImpl.java
@@ -30,6 +30,7 @@ public class StatisticImpl implements Statistic, Resettable {
     private String description;
     private long startTime;
     private long lastSampleTime;
+    private boolean hasUpdated;
     private boolean doReset = true;
 
     public StatisticImpl(String name, String unit, String description) {
@@ -38,17 +39,20 @@ public StatisticImpl(String name, String unit, String description) {
         this.description = description;
         this.startTime = System.currentTimeMillis();
         this.lastSampleTime = this.startTime;
+        this.hasUpdated = false;
     }
 
     public synchronized void reset() {
         if(isDoReset()) {
             this.startTime = System.currentTimeMillis();
             this.lastSampleTime = this.startTime;
+            this.hasUpdated = false;
         }
     }
 
     protected synchronized void updateSampleTime() {
         this.lastSampleTime = System.currentTimeMillis();
+        this.hasUpdated = true;
     }
 
     public synchronized String toString() {
@@ -101,6 +105,9 @@ public boolean isDoReset() {
         return this.doReset;
     }
 
+    public boolean hasUpdated(){
+        return hasUpdated;
+    }
     /**
      * @param doReset the doReset to set
      */

diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/management/TimeStatisticTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/management/TimeStatisticTest.java
@@ -30,9 +30,12 @@ public void testStatistic() throws Exception {
         TimeStatisticImpl stat = new TimeStatisticImpl("myTimer", "millis", "myDescription");
         assertStatistic(stat, "myTimer", "millis", "myDescription");
 
+        assertFalse(stat.hasUpdated());
+
         assertEquals(0, stat.getCount());
 
         stat.addTime(100);
+        assertTrue(stat.hasUpdated());
         assertEquals(1, stat.getCount());
         assertEquals(100, stat.getMinTime());
         assertEquals(100, stat.getMaxTime());
@@ -59,6 +62,7 @@ public void testStatistic() throws Exception {
         LOG.info("Stat is: " + stat);
 
         stat.reset();
+        assertFalse(stat.hasUpdated());
 
         assertEquals(0, stat.getCount());
         assertEquals(0, stat.getMinTime());

diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/plugin/BrokerStatisticsPluginTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/plugin/BrokerStatisticsPluginTest.java
@@ -218,6 +218,7 @@ public void testDestinationStatsWithFirstMessageTimestamp() throws Exception {
         assertEquals(1, reply.getLong("size"));
         assertTrue(reply.getJMSTimestamp() > 0);
         assertTrue(reply.getLong("firstMessageTimestamp") > 0);
+        assertTrue(reply.getLong("lastMessageTimestamp") > 0);
         // Assert that we got the brokerInTime for the first message in queue as value of key "firstMessageTimestamp"
         assertTrue(System.currentTimeMillis() >= reply.getLong("firstMessageTimestamp"));
         assertEquals(Message.DEFAULT_PRIORITY, reply.getJMSPriority());