merlimat closed pull request #919: Fix: broker-zookeeper latency-metrics's
dimension-name
URL: https://github.com/apache/incubator-pulsar/pull/919
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 de988b7d8..8588d9f4c 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
@@ -62,11 +62,11 @@ Metrics getTopicLoadMetrics() {
}
Metrics getZkWriteLatencyMetrics() {
- return getDimensionMetrics("zk_write_latency", "zk_write_latency",
zkWriteLatencyStats);
+ return getDimensionMetrics("zk_write_latency", "zk_write",
zkWriteLatencyStats);
}
Metrics getZkReadLatencyMetrics() {
- return getDimensionMetrics("zk_read_latency", "zk_read_latency",
zkReadLatencyStats);
+ return getDimensionMetrics("zk_read_latency", "zk_read",
zkReadLatencyStats);
}
Metrics getDimensionMetrics(String metricsName, String dimensionName,
DimensionStats stats) {
@@ -90,6 +90,9 @@ Metrics getDimensionMetrics(String metricsName, String
dimensionName, DimensionS
public void reset() {
metricsList.clear();
+ topicLoadStats.reset();
+ zkWriteLatencyStats.reset();
+ zkReadLatencyStats.reset();
}
public void recordTopicLoadTimeValue(long topicLoadLatencyMs) {
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/DimensionStats.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/DimensionStats.java
index 08db011f6..0844e2914 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/DimensionStats.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/DimensionStats.java
@@ -102,6 +102,10 @@ public double getDimensionCount() {
return
defaultRegistry.getSampleValue(dimensionCountLabel).doubleValue();
}
+ public void reset() {
+ summary.clear();
+ }
+
private double getQuantile(double q) {
return defaultRegistry.getSampleValue(name, QUANTILE_LABEL, new
String[] { Collector.doubleToGoString(q) })
.doubleValue();
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperClientAspectJTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperClientAspectJTest.java
index 93a3b08d6..e950fbd62 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperClientAspectJTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/zookeeper/ZooKeeperClientAspectJTest.java
@@ -185,23 +185,23 @@ public void testZkOpStatsMetrics() throws Exception {
pulsarClient.createProducer("persistent://my-property/use/my-ns/my-topic1");
Metrics zkOpMetric = getMetric(pulsar, "zk_write_latency");
Assert.assertNotNull(zkOpMetric);
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_latency_rate_s"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_latency_time_95percentile_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_latency_time_99_99_percentile_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_latency_time_99_9_percentile_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_latency_time_99_percentile_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_latency_time_mean_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_latency_time_median_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_rate_s"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_time_95percentile_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_time_99_99_percentile_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_time_99_9_percentile_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_time_99_percentile_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_time_mean_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_write_time_median_ms"));
zkOpMetric = getMetric(pulsar, "zk_read_latency");
Assert.assertNotNull(zkOpMetric);
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_latency_rate_s"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_latency_time_95percentile_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_latency_time_99_99_percentile_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_latency_time_99_9_percentile_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_latency_time_99_percentile_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_latency_time_mean_ms"));
-
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_latency_time_median_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_rate_s"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_time_95percentile_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_time_99_99_percentile_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_time_99_9_percentile_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_time_99_percentile_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_time_mean_ms"));
+
Assert.assertTrue(zkOpMetric.getMetrics().containsKey("brk_zk_read_time_median_ms"));
CountDownLatch createLatch = new CountDownLatch(1);
CountDownLatch deleteLatch = new CountDownLatch(1);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
