From 56296ef614343562c4556fc12e23fba1f51c1315 Mon Sep 17 00:00:00 2001 From: Hilbrand Bouwkamp Date: Fri, 19 Jun 2026 12:14:32 +0200 Subject: [PATCH] Metric fixes: load usage name to 'work', and removed clientName from description - The metric name used to be `work.load` to keep backward compatible use that name. - Description of metric should be unique, so not including clientQueueName as that is an attribute not a specific metric separator. --- .../taskmanager/metrics/TaskManagerUsageMetricsWrapper.java | 2 +- .../scheduler/priorityqueue/PriorityTaskSchedulerMetrics.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/taskmanager/src/main/java/nl/aerius/taskmanager/metrics/TaskManagerUsageMetricsWrapper.java b/source/taskmanager/src/main/java/nl/aerius/taskmanager/metrics/TaskManagerUsageMetricsWrapper.java index 9da3c24..fafa503 100644 --- a/source/taskmanager/src/main/java/nl/aerius/taskmanager/metrics/TaskManagerUsageMetricsWrapper.java +++ b/source/taskmanager/src/main/java/nl/aerius/taskmanager/metrics/TaskManagerUsageMetricsWrapper.java @@ -33,7 +33,7 @@ public TaskManagerUsageMetricsWrapper(final Meter meter) { rabbitMQUsageMetrics = new UsageMetricsWrapper(meter, "aer.rabbitmq", true); workerPoolUsageMetrics = new UsageMetricsWrapper(meter, "aer.taskmanager.workerpool", false); taskManagerUsageMetrics = new UsageMetricsWrapper(meter, "aer.taskmanager", false); - loadUsageMetricsReporter = new UsageMetricsReporter(meter, "aer.taskmanager.worker.load", "Report average worker load"); + loadUsageMetricsReporter = new UsageMetricsReporter(meter, "aer.taskmanager.work.load", "Report average worker load"); } /** diff --git a/source/taskmanager/src/main/java/nl/aerius/taskmanager/scheduler/priorityqueue/PriorityTaskSchedulerMetrics.java b/source/taskmanager/src/main/java/nl/aerius/taskmanager/scheduler/priorityqueue/PriorityTaskSchedulerMetrics.java index 0fb15ea..3a2acbf 100644 --- a/source/taskmanager/src/main/java/nl/aerius/taskmanager/scheduler/priorityqueue/PriorityTaskSchedulerMetrics.java +++ b/source/taskmanager/src/main/java/nl/aerius/taskmanager/scheduler/priorityqueue/PriorityTaskSchedulerMetrics.java @@ -74,7 +74,7 @@ public void addMetric(final IntSupplier countSupplier, final String workerQueueN public void addMetricWaiting(final IntSupplier countSupplier, final String workerQueueName, final String clientQueueName) { waitingMetrics.put(clientQueueName, OpenTelemetryMetrics.METER .gaugeBuilder(METRIC_PREFIX) - .setDescription(DESCRIPTION + clientQueueName) + .setDescription(DESCRIPTION) .buildWithCallback( result -> result.record(countSupplier.getAsInt(), OpenTelemetryMetrics.queueAttributes(workerQueueName, clientQueueName, "state", "waiting"))));