commit b76d6e17ca6f04351254508e54a06ea93f43f976
author francis lee <francislee.cn@outlook.com> Fri Jul 23 00:28:14 2021 +0800
committer GitHub <noreply@github.com> Fri Jul 23 00:28:14 2021 +0800
tree d1c0e929598d03fe9203014f06b0ef182649d9bc
parent 29cdb83b093372fa43772fbac3d6dd8d7f9c397c
parent ccbac8974dc5e479e52b86859abf434d1618cf60

Merge pull request #52 from haozhijie9527/master

Change the SendBackNums metric from TPS to a one-minute value

src/main/java/org/apache/rocketmq/exporter/collector/RMQMetricsCollector.java

diff --git a/src/main/java/org/apache/rocketmq/exporter/collector/RMQMetricsCollector.java b/src/main/java/org/apache/rocketmq/exporter/collector/RMQMetricsCollector.java
index dcb3577..e6f7bc9 100644
--- a/src/main/java/org/apache/rocketmq/exporter/collector/RMQMetricsCollector.java
+++ b/src/main/java/org/apache/rocketmq/exporter/collector/RMQMetricsCollector.java
@@ -90,7 +90,7 @@
     //consumed message size(byte) for consumer-topic
     private ConcurrentHashMap<ConsumerMetric, Double> groupGetSize = new ConcurrentHashMap<>();
     //re-consumed message count for consumer-topic
-    private ConcurrentHashMap<ConsumerMetric, Double> sendBackNums = new ConcurrentHashMap<>();
+    private ConcurrentHashMap<ConsumerMetric, Long> sendBackNums = new ConcurrentHashMap<>();
     // group latency time
     private ConcurrentHashMap<ConsumerMetric, Long> groupLatencyByTime = new ConcurrentHashMap<>();
 
@@ -500,7 +500,7 @@
         mfs.add(groupGetSizeGauge);
 
         GaugeMetricFamily sendBackNumsGauge = new GaugeMetricFamily("rocketmq_send_back_nums", "SendBackNums", GROUP_NUMS_LABEL_NAMES);
-        for (Map.Entry<ConsumerMetric, Double> entry : sendBackNums.entrySet()) {
+        for (Map.Entry<ConsumerMetric, Long> entry : sendBackNums.entrySet()) {
             loadGroupNumsMetric(sendBackNumsGauge, entry);
         }
         mfs.add(sendBackNumsGauge);
@@ -597,7 +597,7 @@
         groupGetSize.put(new ConsumerMetric(clusterName, brokerName, topic, group), value);
     }
 
-    public void addSendBackNumsMetric(String clusterName, String brokerName, String topic, String group, double value) {
+    public void addSendBackNumsMetric(String clusterName, String brokerName, String topic, String group, long value) {
         sendBackNums.put(new ConsumerMetric(clusterName, brokerName, topic, group), value);
     }
 

src/main/java/org/apache/rocketmq/exporter/task/MetricsCollectTask.java

diff --git a/src/main/java/org/apache/rocketmq/exporter/task/MetricsCollectTask.java b/src/main/java/org/apache/rocketmq/exporter/task/MetricsCollectTask.java
index 193d064..35586df 100644
--- a/src/main/java/org/apache/rocketmq/exporter/task/MetricsCollectTask.java
+++ b/src/main/java/org/apache/rocketmq/exporter/task/MetricsCollectTask.java
@@ -514,7 +514,7 @@
                                 bd.getBrokerName(),
                                 topic,
                                 group,
-                                Utils.getFixedDouble(bsd.getStatsMinute().getTps()));
+                                bsd.getStatsMinute().getSum());
                         } catch (MQClientException ex) {
                             if (ex.getResponseCode() == ResponseCode.SYSTEM_ERROR) {
                                 log.error(String.format("SNDBCK_PUT_NUMS-error, topic=%s, group=%s, master broker=%s, %s", topic, group, masterAddr, ex.getErrorMessage()));