[pulsar] branch master updated: [fix][broker] Fix missing generate some metrics in BrokerOperabilityMetrics (#20720)

[technoboy]

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

technoboy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 5918efdece4 [fix][broker] Fix missing generate some metrics in 
BrokerOperabilityMetrics (#20720)
5918efdece4 is described below

commit 5918efdece4386c0e4928d829832b761144fd12a
Author: Jiwei Guo <techno...@apache.org>
AuthorDate: Wed Sep 13 20:05:30 2023 -0500

    [fix][broker] Fix missing generate some metrics in BrokerOperabilityMetrics 
(#20720)
---
 .../org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java     | 1 +
 .../pulsar/broker/stats/prometheus/PrometheusMetricsGenerator.java   | 5 ++---
 .../java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java   | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java
index 32192f01b6a..b6379d381c6 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/BrokerOperabilityMetrics.java
@@ -59,6 +59,7 @@ public class BrokerOperabilityMetrics {
     }
 
     private void generate() {
+        reset();
         metricsList.add(getTopicLoadMetrics());
         metricsList.add(getConnectionMetrics());
     }
diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGenerator.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGenerator.java
index 501bfbbb163..124f0d3e54e 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGenerator.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/PrometheusMetricsGenerator.java
@@ -34,7 +34,6 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.nio.ByteBuffer;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -243,8 +242,8 @@ public class PrometheusMetricsGenerator {
                     clusterName, Collector.Type.GAUGE, stream);
         }
 
-        
parseMetricsToPrometheusMetrics(Collections.singletonList(pulsar.getBrokerService()
-                        
.getPulsarStats().getBrokerOperabilityMetrics().generateConnectionMetrics()),
+        parseMetricsToPrometheusMetrics(pulsar.getBrokerService()
+                        
.getPulsarStats().getBrokerOperabilityMetrics().getMetrics(),
                 clusterName, Collector.Type.GAUGE, stream);
 
         // generate loadBalance metrics
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java
index c4aa08f4f6f..80f9cd8913f 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/PrometheusMetricsTest.java
@@ -251,6 +251,10 @@ public class PrometheusMetricsTest extends BrokerTestBase {
         Collection<Metric> pulsarTopicLoadTimesCountMetrics = 
metrics.get("pulsar_topic_load_times_count");
         assertEquals(pulsarTopicLoadTimesMetrics.size(), 6);
         assertEquals(pulsarTopicLoadTimesCountMetrics.size(), 1);
+        Collection<Metric> topicLoadTimeP999Metrics = 
metrics.get("pulsar_topic_load_time_99_9_percentile_ms");
+        Collection<Metric> topicLoadTimeFailedCountMetrics = 
metrics.get("pulsar_topic_load_failed_count");
+        assertEquals(topicLoadTimeP999Metrics.size(), 1);
+        assertEquals(topicLoadTimeFailedCountMetrics.size(), 1);
     }
 
     @Test