You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/01/24 01:21:46 UTC
[incubator-servicecomb-java-chassis] 09/10: SCB-150 fix pr comment
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 604afb2e98fac07d1bf5f46d081b48e576e84b51
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Wed Jan 17 10:19:32 2018 +0800
SCB-150 fix pr comment
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../metrics/common/DoubleMetricValue.java | 8 +-----
.../metrics/common/LongMetricValue.java | 8 +-----
.../metrics/core/utils/MonitorUtils.java | 3 +-
.../metrics/prometheus/MetricsCollector.java | 33 ++++++++++++----------
4 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/DoubleMetricValue.java b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/DoubleMetricValue.java
index 30a7790..e6ace95 100644
--- a/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/DoubleMetricValue.java
+++ b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/DoubleMetricValue.java
@@ -22,8 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class DoubleMetricValue extends MetricValue<Double> {
@@ -38,11 +36,7 @@ public class DoubleMetricValue extends MetricValue<Double> {
}
private DoubleMetricValue merge(DoubleMetricValue value) {
- if (this.getKey().equals(value.getKey())) {
- return new DoubleMetricValue(this.getKey(), this.getValue() + value.getValue(), this.getDimensions());
- }
- throw new ServiceCombException("unable merge different key values,source key :" + value.getKey() +
- " target key :" + this.getKey());
+ return new DoubleMetricValue(this.getKey(), this.getValue() + value.getValue(), this.getDimensions());
}
public static List<DoubleMetricValue> merge(List<DoubleMetricValue> source, List<DoubleMetricValue> target) {
diff --git a/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/LongMetricValue.java b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/LongMetricValue.java
index 84babff..ff27134 100644
--- a/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/LongMetricValue.java
+++ b/metrics/metrics-common/src/main/java/org/apache/servicecomb/metrics/common/LongMetricValue.java
@@ -22,8 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class LongMetricValue extends MetricValue<Long> {
@@ -38,11 +36,7 @@ public class LongMetricValue extends MetricValue<Long> {
}
private LongMetricValue merge(LongMetricValue value) {
- if (this.getKey().equals(value.getKey())) {
- return new LongMetricValue(this.getKey(), this.getValue() + value.getValue(), this.getDimensions());
- }
- throw new ServiceCombException("unable merge different key values,source key :" + value.getKey() +
- " target key :" + this.getKey());
+ return new LongMetricValue(this.getKey(), this.getValue() + value.getValue(), this.getDimensions());
}
public static List<LongMetricValue> merge(List<LongMetricValue> source, List<LongMetricValue> target) {
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/utils/MonitorUtils.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/utils/MonitorUtils.java
index 31be367..f2a8169 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/utils/MonitorUtils.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/utils/MonitorUtils.java
@@ -17,6 +17,7 @@
package org.apache.servicecomb.metrics.core.utils;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -58,7 +59,7 @@ public class MonitorUtils {
}
return tagMap;
}
- return null;
+ return Collections.emptyMap();
}
//Counting use System.nano get more precise time
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 290d383..932863e 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
@@ -59,30 +59,33 @@ public class MetricsCollector extends Collector implements Collector.Describable
RegistryMetric registryMetric = dataSource.getRegistryMetric();
List<MetricFamilySamples> familySamples = new ArrayList<>();
- List<Sample> samples = new ArrayList<>();
- samples.addAll(convertMetricValues(registryMetric.getInstanceMetric().getSystemMetric().toMap()));
- samples.addAll(convertConsumerMetric(registryMetric.getInstanceMetric().getConsumerMetric()));
- samples.addAll(convertCallMetric(registryMetric.getInstanceMetric().getConsumerMetric().getConsumerCall()));
- samples.addAll(convertProducerMetric(registryMetric.getInstanceMetric().getProducerMetric()));
- samples.addAll(convertCallMetric(registryMetric.getInstanceMetric().getProducerMetric().getProducerCall()));
- familySamples.add(new MetricFamilySamples("Instance Level", Type.UNTYPED, "Instance Level Metrics", samples));
+ List<Sample> instanceSamples = new ArrayList<>();
+ instanceSamples.addAll(convertMetricValues(registryMetric.getInstanceMetric().getSystemMetric().toMap()));
+ instanceSamples.addAll(convertConsumerMetric(registryMetric.getInstanceMetric().getConsumerMetric()));
+ instanceSamples.addAll(convertCallMetric(registryMetric.getInstanceMetric().getConsumerMetric().getConsumerCall()));
+ instanceSamples.addAll(convertProducerMetric(registryMetric.getInstanceMetric().getProducerMetric()));
+ instanceSamples.addAll(convertCallMetric(registryMetric.getInstanceMetric().getProducerMetric().getProducerCall()));
+ familySamples
+ .add(new MetricFamilySamples("Instance Level", Type.UNTYPED, "Instance Level Metrics", instanceSamples));
if (registryMetric.getConsumerMetrics().size() != 0) {
- samples = new ArrayList<>();
+ List<Sample> consumerSamples = new ArrayList<>();
for (ConsumerInvocationMetric metric : registryMetric.getConsumerMetrics().values()) {
- samples.addAll(convertConsumerMetric(metric));
- samples.addAll(convertCallMetric(metric.getConsumerCall()));
+ consumerSamples.addAll(convertConsumerMetric(metric));
+ consumerSamples.addAll(convertCallMetric(metric.getConsumerCall()));
}
- familySamples.add(new MetricFamilySamples("Consumer Side", Type.UNTYPED, "Consumer Side Metrics", samples));
+ familySamples
+ .add(new MetricFamilySamples("Consumer Side", Type.UNTYPED, "Consumer Side Metrics", consumerSamples));
}
if (registryMetric.getProducerMetrics().size() != 0) {
- samples = new ArrayList<>();
+ List<Sample> producerSamples = new ArrayList<>();
for (ProducerInvocationMetric metric : registryMetric.getProducerMetrics().values()) {
- samples.addAll(convertProducerMetric(metric));
- samples.addAll(convertCallMetric(metric.getProducerCall()));
+ producerSamples.addAll(convertProducerMetric(metric));
+ producerSamples.addAll(convertCallMetric(metric.getProducerCall()));
}
- familySamples.add(new MetricFamilySamples("Producer Side", Type.UNTYPED, "Producer Side Metrics", samples));
+ familySamples
+ .add(new MetricFamilySamples("Producer Side", Type.UNTYPED, "Producer Side Metrics", producerSamples));
}
return familySamples;
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.