Merge pull request #19692 from vespa-engine/balder/count-working-days-2

Add a metric for how many times a worker in a thread pool has woken up.

2 files changed, 9 insertions, 3 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp
index 74e0971178c..3c98857242f 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.cpp
@@ -10,6 +10,8 @@ ExecutorMetrics::update(const vespalib::ExecutorStats &stats)
     maxPending.set(stats.queueSize.max());
     accepted.inc(stats.acceptedTasks);
     rejected.inc(stats.rejectedTasks);
+    wakeupCount.inc(stats.wakeupCount);
+    util.set(stats.getUtil());
     const auto & qSize = stats.queueSize;
     queueSize.addValueBatch(qSize.average(), qSize.count(), qSize.min(), qSize.max());
 }
@@ -19,6 +21,8 @@ ExecutorMetrics::ExecutorMetrics(const std::string &name, metrics::MetricSet *pa
       maxPending("maxpending", {}, "Maximum number of pending (active + queued) tasks", this),
       accepted("accepted", {}, "Number of accepted tasks", this),
       rejected("rejected", {}, "Number of rejected tasks", this),
+      wakeupCount("wakeupCount", {}, "Number of times a worker thread has been woken up", this),
+      util("utilization", {}, "Ratio of time the worker threads has been active", this),
       queueSize("queuesize", {}, "Size of task queue", this)
 {
 }
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.h
index 273c4ed8979..31d959a399f 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/executor_metrics.h
@@ -11,9 +11,11 @@ namespace proton {
 
 struct ExecutorMetrics : metrics::MetricSet
 {
-    metrics::LongValueMetric maxPending; // TODO Remove on Vespa 8 or sooner if possible.
-    metrics::LongCountMetric accepted;
-    metrics::LongCountMetric rejected;
+    metrics::LongValueMetric   maxPending; // TODO Remove on Vespa 8 or sooner if possible.
+    metrics::LongCountMetric   accepted;
+    metrics::LongCountMetric   rejected;
+    metrics::LongCountMetric   wakeupCount;
+    metrics::DoubleValueMetric util;
     metrics::LongAverageMetric queueSize;
 
     void update(const vespalib::ExecutorStats &stats);