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 ebc6af6ad8d9b1eb4c5cb3c40b5bbbd803fb6324 Author: zhengyangyong <[email protected]> AuthorDate: Wed Jan 24 10:21:42 2018 +0800 SCB-12 resolve conflict Signed-off-by: zhengyangyong <[email protected]> --- .../apache/servicecomb/metrics/core/TestStatusDimension.java | 7 ++++++- .../servicecomb/metrics/prometheus/MetricsCollector.java | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestStatusDimension.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestStatusDimension.java index 0a113fb..844aa04 100644 --- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestStatusDimension.java +++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestStatusDimension.java @@ -25,6 +25,9 @@ import org.apache.servicecomb.core.metrics.InvocationStartedEvent; import org.apache.servicecomb.foundation.common.utils.EventUtils; import org.apache.servicecomb.metrics.common.MetricsDimension; import org.apache.servicecomb.metrics.common.RegistryMetric; +import org.apache.servicecomb.metrics.core.custom.DefaultCounterService; +import org.apache.servicecomb.metrics.core.custom.DefaultGaugeService; +import org.apache.servicecomb.metrics.core.custom.DefaultWindowCounterService; import org.apache.servicecomb.metrics.core.event.DefaultEventListenerManager; import org.apache.servicecomb.metrics.core.event.dimension.StatusConvertorFactory; import org.apache.servicecomb.metrics.core.monitor.DefaultSystemMonitor; @@ -96,7 +99,9 @@ public class TestStatusDimension { private RegistryMetric prepare(String outputLevel) throws InterruptedException { DefaultSystemMonitor systemMonitor = new DefaultSystemMonitor(); - RegistryMonitor monitor = new RegistryMonitor(systemMonitor); + + RegistryMonitor monitor = new RegistryMonitor(systemMonitor, new DefaultCounterService(), new DefaultGaugeService(), + new DefaultWindowCounterService()); DefaultDataSource dataSource = new DefaultDataSource(monitor, "1000,2000,3000"); new DefaultEventListenerManager(monitor, new StatusConvertorFactory(), outputLevel); 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 a640736..52bab8e 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 @@ -78,11 +78,6 @@ public class MetricsCollector extends Collector implements Collector.Describable .add(new MetricFamilySamples("Consumer Side", Type.UNTYPED, "Consumer Side Metrics", consumerSamples)); } - if (registryMetric.getCustomMetrics().size() != 0) { - familySamples.add(getFamilySamples("User Custom", registryMetric.getCustomMetrics())); - } - - if (registryMetric.getProducerMetrics().size() != 0) { List<Sample> producerSamples = new ArrayList<>(); for (ProducerInvocationMetric metric : registryMetric.getProducerMetrics().values()) { @@ -93,6 +88,10 @@ public class MetricsCollector extends Collector implements Collector.Describable .add(new MetricFamilySamples("Producer Side", Type.UNTYPED, "Producer Side Metrics", producerSamples)); } + if (registryMetric.getCustomMetrics().size() != 0) { + familySamples.add(getFamilySamples("User Custom", registryMetric.getCustomMetrics())); + } + return familySamples; } @@ -103,6 +102,8 @@ public class MetricsCollector extends Collector implements Collector.Describable new ArrayList<>(), new ArrayList<>(), entry.getValue().doubleValue())) .collect(Collectors.toList()); return new MetricFamilySamples(name, Type.UNTYPED, name + " Metrics", samples); + } + private List<Sample> convertConsumerMetric(ConsumerInvocationMetric metric) { return convertMetricValues(metric.getConsumerLatency().toMap()); } -- To stop receiving notification emails like this one, please contact [email protected].
