From 449dbcad01d0b18531b0a2707e933cbbe60733d8 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 17 Sep 2020 16:06:30 +0200 Subject: Add metrics for the threadpool's work queue --- .../yahoo/vespa/model/admin/monitoring/VespaMetricSet.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java index 120e323e652..78e97719af0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.model.admin.monitoring; import java.util.Collections; import java.util.LinkedHashSet; +import java.util.List; import java.util.Set; import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet; @@ -129,7 +130,12 @@ public class VespaMetricSet { metrics.add(new Metric("serverActiveThreads.count")); metrics.add(new Metric("serverActiveThreads.last")); - metrics.add(new Metric("jdisc.thread_pool.unhandled_exceptions.rate")); + { + List suffices = List.of("sum", "count", "last", "min", "max"); + addMetric(metrics, "jdisc.thread_pool.unhandled_exceptions", suffices); + addMetric(metrics, "jdisc.thread_pool.work_queue.capacity", suffices); + addMetric(metrics, "jdisc.thread_pool.work_queue.size", suffices); + } metrics.add(new Metric("httpapi_latency.max")); metrics.add(new Metric("httpapi_latency.sum")); @@ -687,4 +693,10 @@ public class VespaMetricSet { return metrics; } + private static void addMetric(Set metrics, String metricName, List aggregateSuffices) { + for (String suffix : aggregateSuffices) { + metrics.add(new Metric(metricName + "." + suffix)); + } + } + } -- cgit v1.2.3