[incubator-servicecomb-java-chassis] 07/10: SCB-150 fix RegistryMetric serialization

[ni...@apache.org]

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

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit a103bf57395762a64c14e909ac1e60476882f1fb
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Fri Jan 12 16:07:38 2018 +0800

    SCB-150 fix RegistryMetric serialization
    
    Signed-off-by: zhengyangyong <ya...@huawei.com>
---
 .../main/java/org/apache/servicecomb/metrics/common/CallMetric.java   | 4 ++--
 .../org/apache/servicecomb/metrics/prometheus/MetricsCollector.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/CallMetric.java b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/CallMetric.java
index d313acf..56d0f99 100644
--- a/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/CallMetric.java
+++ b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/CallMetric.java
@@ -35,7 +35,7 @@ public class CallMetric {
     return prefix;
   }
 
-  public List<LongMetricValue> getTotalValue() {
+  public List<LongMetricValue> getTotalValues() {
     return totalValues;
   }
 
@@ -75,7 +75,7 @@ public class CallMetric {
 
   public CallMetric merge(CallMetric metric) {
     return new CallMetric(this.prefix,
-        LongMetricValue.merge(metric.getTotalValue(), this.getTotalValue()),
+        LongMetricValue.merge(metric.getTotalValues(), this.getTotalValues()),
         DoubleMetricValue.merge(metric.getTpsValues(), this.getTpsValues()));
   }
 
diff --git a/metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/MetricsCollector.java b/metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/MetricsCollector.java
index b22d8ea..f784722 100644
--- a/metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/MetricsCollector.java
+++ b/metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/MetricsCollector.java
@@ -112,7 +112,7 @@ public class MetricsCollector extends Collector implements Collector.Describable
   private List<Sample> convertCallMetric(CallMetric metric) {
     List<Sample> samples = new ArrayList<>();
     String totalName = formatMetricName(metric.getPrefix() + ".total");
-    for (LongMetricValue value : metric.getTotalValue()) {
+    for (LongMetricValue value : metric.getTotalValues()) {
       samples.add(new Sample(totalName,
           new ArrayList<>(value.getDimensions().keySet()), new ArrayList<>(value.getDimensions().values()),
           (double) value.getValue()));

-- 
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.