diff options
Diffstat (limited to 'metrics/src')
-rw-r--r-- | metrics/src/main/java/com/yahoo/metrics/Metric.java | 2 | ||||
-rw-r--r-- | metrics/src/main/java/com/yahoo/metrics/MetricSet.java | 6 | ||||
-rw-r--r-- | metrics/src/tests/valuemetrictest.cpp | 3 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/jsonwriter.cpp | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/metrics/src/main/java/com/yahoo/metrics/Metric.java b/metrics/src/main/java/com/yahoo/metrics/Metric.java index f1f389a4dfe..ad7ffc971f6 100644 --- a/metrics/src/main/java/com/yahoo/metrics/Metric.java +++ b/metrics/src/main/java/com/yahoo/metrics/Metric.java @@ -65,7 +65,7 @@ public abstract class Metric { } public List<String> getPathVector() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); result.add(getName()); MetricSet owner = this.owner; while (owner != null) { diff --git a/metrics/src/main/java/com/yahoo/metrics/MetricSet.java b/metrics/src/main/java/com/yahoo/metrics/MetricSet.java index 5305002782d..a9fea1c65a4 100644 --- a/metrics/src/main/java/com/yahoo/metrics/MetricSet.java +++ b/metrics/src/main/java/com/yahoo/metrics/MetricSet.java @@ -6,11 +6,11 @@ import com.yahoo.text.XMLWriter; import java.util.*; import java.util.logging.Logger; -public abstract class MetricSet extends Metric -{ +public abstract class MetricSet extends Metric { + private static Logger log = Logger.getLogger(MetricSet.class.getName()); - List<Metric> metricOrder = new ArrayList<Metric>(); // Keep added order for reporting + List<Metric> metricOrder = new ArrayList<>(); // Keep added order for reporting boolean registrationAltered; // Set to true if metrics have been // registered/unregistered since last time // it was reset diff --git a/metrics/src/tests/valuemetrictest.cpp b/metrics/src/tests/valuemetrictest.cpp index da730b7c8a9..5aa00e5ba0a 100644 --- a/metrics/src/tests/valuemetrictest.cpp +++ b/metrics/src/tests/valuemetrictest.cpp @@ -232,6 +232,7 @@ void ValueMetricTest::testJson() { " \"values\":\n" " {\n" " \"average\":0.0,\n" + " \"sum\":0.0,\n" " \"count\":0,\n" " \"min\":0.0,\n" " \"max\":0.0,\n" @@ -251,6 +252,7 @@ void ValueMetricTest::testJson() { " \"values\":\n" " {\n" " \"average\":100.0,\n" + " \"sum\":100.0,\n" " \"count\":1,\n" " \"min\":100.0,\n" " \"max\":100.0,\n" @@ -269,6 +271,7 @@ void ValueMetricTest::testJson() { " \"values\":\n" " {\n" " \"average\":300.0,\n" + " \"sum\":600.0,\n" " \"count\":2,\n" " \"min\":100.0,\n" " \"max\":500.0,\n" diff --git a/metrics/src/vespa/metrics/jsonwriter.cpp b/metrics/src/vespa/metrics/jsonwriter.cpp index d890d725c8a..9b8232dd42f 100644 --- a/metrics/src/vespa/metrics/jsonwriter.cpp +++ b/metrics/src/vespa/metrics/jsonwriter.cpp @@ -132,6 +132,7 @@ JsonWriter::visitValueMetric(const AbstractValueMetric& m, bool) _stream << (values->getDoubleValue("total") / values->getDoubleValue("count")); } + _stream << "sum" << values->getDoubleValue("total"); _stream << "count"; values->output("count", _stream); if (_period > 0) { |