[pulsar] branch branch-2.7 updated: Add metrics for nonContiguousDeletedMessagesRange (#10638)

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 9e8fcc8  Add metrics for nonContiguousDeletedMessagesRange (#10638)
9e8fcc8 is described below

commit 9e8fcc899d0b0d9c3c9fb7dcdd174a3543a73e47
Author: 赵家贝 <41...@users.noreply.github.com>
AuthorDate: Thu May 20 09:29:12 2021 +0800

    Add metrics for nonContiguousDeletedMessagesRange (#10638)
    
    ### Motivation
    
    Users want a metric for this value from the internal-stats call.
    
    ### Modifications
    
    Add metrics for the ManagedCursor:
    
    metrics.put("brk_ml_cursor_nonContiguousDeletedMessagesRange",
    (long) cursor.getTotalNonContiguousDeletedMessagesRange());
    
    Modify test:
    
    Assert.assertEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_nonContiguousDeletedMessagesRange"), 0L);
    
    (cherry picked from commit b7d3ae17f306345d34f2cd877f2eae2c66bb3913)
---
 .../org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java    | 2 ++
 .../java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java
index e888c93..7000aae 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/metrics/ManagedCursorMetrics.java
@@ -71,6 +71,8 @@ public class ManagedCursorMetrics extends AbstractMetrics {
                 dimensionMap.put("ledger_name", ledgerName);
                 dimensionMap.put("cursor_name", cursor.getName());
                 Metrics metrics = createMetrics(dimensionMap);
+                metrics.put("brk_ml_cursor_nonContiguousDeletedMessagesRange",
+                        (long) cursor.getTotalNonContiguousDeletedMessagesRange());
                 metrics.put("brk_ml_cursor_persistLedgerSucceed", cStats.getPersistLedgerSucceed());
                 metrics.put("brk_ml_cursor_persistLedgerErrors", cStats.getPersistLedgerErrors());
                 metrics.put("brk_ml_cursor_persistZookeeperSucceed", cStats.getPersistZookeeperSucceed());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java
index d7fc3f01..79a30ef 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedCursorMetricsTest.java
@@ -98,6 +98,7 @@ public class ManagedCursorMetricsTest extends MockedPulsarServiceBaseTest {
         Assert.assertNotEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_persistLedgerErrors"), 0L);
         Assert.assertNotEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_persistZookeeperSucceed"), 0L);
         Assert.assertEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_persistZookeeperErrors"), 0L);
+        Assert.assertEquals(metricsList.get(0).getMetrics().get("brk_ml_cursor_nonContiguousDeletedMessagesRange"), 0L);
     }
 
 }