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 14521ec50bf5a10541a3967bff3a13cd4a08ef68 Author: zhengyangyong <[email protected]> AuthorDate: Fri Jan 12 15:23:14 2018 +0800 SCB-150 minor refactor for prometheus Signed-off-by: zhengyangyong <[email protected]> --- .../metrics/core/monitor/DefaultSystemMonitor.java | 9 ++------- .../metrics/prometheus/MetricsCollector.java | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/DefaultSystemMonitor.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/DefaultSystemMonitor.java index 3541d82..5977521 100644 --- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/DefaultSystemMonitor.java +++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/monitor/DefaultSystemMonitor.java @@ -98,12 +98,7 @@ public class DefaultSystemMonitor implements SystemMonitor { @Override public SystemMetric toMetric() { - return new SystemMetric(adjustValue(getCpuLoad()), - getCpuRunningThreads(), getHeapInit(), getHeapMax(), getHeapCommit(), getHeapUsed(), - getNonHeapInit(), getNonHeapMax(), getNonHeapCommit(), getNonHeapUsed()); - } - - private double adjustValue(double value) { - return value < 0 ? Double.NaN : value; + return new SystemMetric(getCpuLoad(), getCpuRunningThreads(), getHeapInit(), getHeapMax(), getHeapCommit(), + getHeapUsed(), getNonHeapInit(), getNonHeapMax(), getNonHeapCommit(), getNonHeapUsed()); } } 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 bad097b..b22d8ea 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 @@ -97,26 +97,27 @@ public class MetricsCollector extends Collector implements Collector.Describable samples.addAll(convertMetricValues(metric.getExecutionTime().toMap())); samples.addAll(convertMetricValues(metric.getLifeTimeInQueue().toMap())); samples.addAll(convertMetricValues(metric.getProducerLatency().toMap())); - samples.add(new Sample(metric.getPrefix() + ".waitInQueue.count", new ArrayList<>(), new ArrayList<>(), - (double) metric.getWaitInQueue())); + samples.add( + new Sample(formatMetricName(metric.getPrefix() + ".waitInQueue.count"), new ArrayList<>(), new ArrayList<>(), + (double) metric.getWaitInQueue())); return samples; } private List<Sample> convertMetricValues(Map<String, Number> metrics) { return metrics.entrySet().stream().map((entry) -> - new Sample(entry.getKey().replace(".", "_"), - new ArrayList<>(), new ArrayList<>(), entry.getValue().doubleValue())).collect(Collectors.toList()); + new Sample(formatMetricName(entry.getKey()), new ArrayList<>(), new ArrayList<>(), + entry.getValue().doubleValue())).collect(Collectors.toList()); } private List<Sample> convertCallMetric(CallMetric metric) { List<Sample> samples = new ArrayList<>(); - String totalName = (metric.getPrefix() + ".total").replace(".", "_"); + String totalName = formatMetricName(metric.getPrefix() + ".total"); for (LongMetricValue value : metric.getTotalValue()) { samples.add(new Sample(totalName, new ArrayList<>(value.getDimensions().keySet()), new ArrayList<>(value.getDimensions().values()), (double) value.getValue())); } - String tpsName = (metric.getPrefix() + ".tps").replace(".", "_"); + String tpsName = formatMetricName(metric.getPrefix() + ".tps"); for (DoubleMetricValue value : metric.getTpsValues()) { samples.add(new Sample(tpsName, new ArrayList<>(value.getDimensions().keySet()), new ArrayList<>(value.getDimensions().values()), @@ -124,4 +125,9 @@ public class MetricsCollector extends Collector implements Collector.Describable } return samples; } + + //convert name for match prometheus + private String formatMetricName(String name) { + return name.replace(".", "_"); + } } -- To stop receiving notification emails like this one, please contact [email protected].
