aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src
diff options
context:
space:
mode:
authorOla Aunronning <olaa@yahooinc.com>2023-08-09 10:39:17 +0200
committerOla Aunronning <olaa@yahooinc.com>2023-08-09 10:44:38 +0200
commit2e9c5a3890732ee0868745087b4e3360689e155c (patch)
tree8f255e9dc8571026fe5437af1fd03cac4c0dd9d0 /container-core/src
parent9697636fb3e86c025d4e636ef5958e7585620a1a (diff)
Add min/sum/count suffixes to gauge metrics
Diffstat (limited to 'container-core/src')
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java8
-rw-r--r--container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java10
2 files changed, 15 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
index c60389fc55e..b8beeb5c1d1 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
@@ -231,7 +231,10 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
GaugeMetric gauge = (GaugeMetric) value;
metrics.put(name + ".average", sanitizeDouble(gauge.getAverage()))
.put(name + ".last", sanitizeDouble(gauge.getLast()))
- .put(name + ".max", sanitizeDouble(gauge.getMax()));
+ .put(name + ".max", sanitizeDouble(gauge.getMax()))
+ .put(name + ".min", sanitizeDouble(gauge.getMin()))
+ .put(name + ".sum", sanitizeDouble(gauge.getSum()))
+ .put(name + ".count", gauge.getCount());
if (gauge.getPercentiles().isPresent()) {
for (Tuple2<String, Double> prefixAndValue : gauge.getPercentiles().get()) {
metrics.put(name + "." + prefixAndValue.first + "percentile", prefixAndValue.second.doubleValue());
@@ -255,6 +258,9 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
metrics.put(name + ".average", sanitizeDouble(gauge.getAverage()));
metrics.put(name + ".last", sanitizeDouble(gauge.getLast()));
metrics.put(name + ".max", sanitizeDouble(gauge.getMax()));
+ metrics.put(name + ".min", sanitizeDouble(gauge.getMin()));
+ metrics.put(name + ".sum", sanitizeDouble(gauge.getSum()));
+ metrics.put(name + ".count", gauge.getCount());
if (gauge.getPercentiles().isPresent()) {
for (Tuple2<String, Double> prefixAndValue : gauge.getPercentiles().get()) {
metrics.put(name + "." + prefixAndValue.first + "percentile", prefixAndValue.second.doubleValue());
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java
index 38c1072c759..1aa4ee93ab6 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java
@@ -189,10 +189,16 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase {
"gauge.metric.average" : 0.2,
"gauge.metric.last" : 0.2,
"gauge.metric.max" : 0.2,
+ "gauge.metric.min" : 0.2,
+ "gauge.metric.sum" : 0.2,
+ "gauge.metric.count" : 1,
"configserver.requests.count" : 120,
"lockAttempt.lockedLoad.average" : 500.0,
"lockAttempt.lockedLoad.last" : 500.0,
"lockAttempt.lockedLoad.max" : 500.0,
+ "lockAttempt.lockedLoad.min" : 500.0,
+ "lockAttempt.lockedLoad.sum" : 500.0,
+ "lockAttempt.lockedLoad.count" : 1,
"counter.metric.count" : 5
}
}
@@ -210,9 +216,9 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase {
"host" : "some-hostname"
},
"metrics" : {
- "lockAttempt.lockedLoad.max" : 500.0,
"configserver.requests.count" : 120,
- "lockAttempt.lockedLoad.average" : 500.0
+ "lockAttempt.lockedLoad.average" : 500.0,
+ "lockAttempt.lockedLoad.max" : 500.0
}
}
""";