[storm] branch master updated: [STORM-3785] Stop converting V2 rate metrics when adding to V1 (#3405)

[ethanli]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0c7bbca  [STORM-3785] Stop converting V2 rate metrics when adding to 
V1 (#3405)
0c7bbca is described below

commit 0c7bbca67db593b82030a7b406a44d54122ce792
Author: Rui Li <rui...@verizonmedia.com>
AuthorDate: Wed Sep 22 13:25:35 2021 -0500

    [STORM-3785] Stop converting V2 rate metrics when adding to V1 (#3405)
---
 .../jvm/org/apache/storm/executor/Executor.java    | 37 +++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/storm-client/src/jvm/org/apache/storm/executor/Executor.java 
b/storm-client/src/jvm/org/apache/storm/executor/Executor.java
index 698f7dc..8752d01 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/Executor.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/Executor.java
@@ -424,27 +424,28 @@ public abstract class Executor implements Callable, 
JCQueue.Consumer {
     private void addMeteredDatapoints(String baseName, Metered metered, 
List<IMetricsConsumer.DataPoint> dataPoints) {
         IMetricsConsumer.DataPoint dataPoint = new 
IMetricsConsumer.DataPoint(baseName + ".count", metered.getCount());
         dataPoints.add(dataPoint);
-        addConvertedMetric(baseName, ".m1_rate", metered.getOneMinuteRate(), 
dataPoints);
-        addConvertedMetric(baseName, ".m5_rate", metered.getFiveMinuteRate(), 
dataPoints);
-        addConvertedMetric(baseName, ".m15_rate", 
metered.getFifteenMinuteRate(), dataPoints);
-        addConvertedMetric(baseName, ".mean_rate", metered.getMeanRate(), 
dataPoints);
+        addConvertedMetric(baseName, ".m1_rate", metered.getOneMinuteRate(), 
dataPoints, false);
+        addConvertedMetric(baseName, ".m5_rate", metered.getFiveMinuteRate(), 
dataPoints, false);
+        addConvertedMetric(baseName, ".m15_rate", 
metered.getFifteenMinuteRate(), dataPoints, false);
+        addConvertedMetric(baseName, ".mean_rate", metered.getMeanRate(), 
dataPoints, false);
     }
 
     private void addSnapshotDatapoints(String baseName, Snapshot snapshot, 
List<IMetricsConsumer.DataPoint> dataPoints) {
-        addConvertedMetric(baseName, ".max", snapshot.getMax(), dataPoints);
-        addConvertedMetric(baseName, ".mean", snapshot.getMean(), dataPoints);
-        addConvertedMetric(baseName, ".min", snapshot.getMin(), dataPoints);
-        addConvertedMetric(baseName, ".stddev", snapshot.getStdDev(), 
dataPoints);
-        addConvertedMetric(baseName, ".p50", snapshot.getMedian(), dataPoints);
-        addConvertedMetric(baseName, ".p75", snapshot.get75thPercentile(), 
dataPoints);
-        addConvertedMetric(baseName, ".p95", snapshot.get95thPercentile(), 
dataPoints);
-        addConvertedMetric(baseName, ".p98", snapshot.get98thPercentile(), 
dataPoints);
-        addConvertedMetric(baseName, ".p99", snapshot.get99thPercentile(), 
dataPoints);
-        addConvertedMetric(baseName, ".p999", snapshot.get999thPercentile(), 
dataPoints);
-    }
-
-    private void addConvertedMetric(String baseName, String suffix, double 
value, List<IMetricsConsumer.DataPoint> dataPoints) {
-        IMetricsConsumer.DataPoint dataPoint = new 
IMetricsConsumer.DataPoint(baseName + suffix, convertDuration(value));
+        addConvertedMetric(baseName, ".max", snapshot.getMax(), dataPoints, 
true);
+        addConvertedMetric(baseName, ".mean", snapshot.getMean(), dataPoints, 
true);
+        addConvertedMetric(baseName, ".min", snapshot.getMin(), dataPoints, 
true);
+        addConvertedMetric(baseName, ".stddev", snapshot.getStdDev(), 
dataPoints, true);
+        addConvertedMetric(baseName, ".p50", snapshot.getMedian(), dataPoints, 
true);
+        addConvertedMetric(baseName, ".p75", snapshot.get75thPercentile(), 
dataPoints, true);
+        addConvertedMetric(baseName, ".p95", snapshot.get95thPercentile(), 
dataPoints, true);
+        addConvertedMetric(baseName, ".p98", snapshot.get98thPercentile(), 
dataPoints, true);
+        addConvertedMetric(baseName, ".p99", snapshot.get99thPercentile(), 
dataPoints, true);
+        addConvertedMetric(baseName, ".p999", snapshot.get999thPercentile(), 
dataPoints, true);
+    }
+
+    private void addConvertedMetric(String baseName, String suffix, double 
value, List<IMetricsConsumer.DataPoint> dataPoints, boolean needConversion) {
+        IMetricsConsumer.DataPoint dataPoint
+            = new IMetricsConsumer.DataPoint(baseName + suffix, needConversion 
? convertDuration(value) : value);
         dataPoints.add(dataPoint);
     }