Skip to content

Fix for adding usage metrics #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hilbrand merged 1 commit into from
Jun 11, 2026
Merged

Fix for adding usage metrics #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions source/taskmanager/src/main/java/nl/aerius/taskmanager/metrics/UsageMetricsReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@
*/
package nl.aerius.taskmanager.metrics;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.function.DoubleSupplier;

import org.slf4j.Logger;
Expand All @@ -38,7 +41,7 @@ class UsageMetricsReporter {

private record UsageMetric(DoubleSupplier metricSupplier, Attributes attributes) {}

private final Map<String, UsageMetric> metricsMap = new HashMap<>();
private final Map<String, List<UsageMetric>> metricsMap = new HashMap<>();
private final ObservableDoubleGauge gauge;

public UsageMetricsReporter(final Meter meter, final String metricName, final String description) {
Expand All @@ -49,12 +52,12 @@ public UsageMetricsReporter(final Meter meter, final String metricName, final St
}

private void recordMetrics(final ObservableDoubleMeasurement measurement) {
for (final Map.Entry<String, UsageMetric> entry : metricsMap.entrySet()) {
final UsageMetric metric = entry.getValue();
for (final Entry<String, List<UsageMetric>> workerMetrics : metricsMap.entrySet()) {
for (final UsageMetric metric : workerMetrics.getValue()) {

measurement.record(metric.metricSupplier().getAsDouble(), metric.attributes());
measurement.record(metric.metricSupplier().getAsDouble(), metric.attributes());
}
}
LOG.debug("Workload for {}", measurement);
}

/**
Expand All @@ -65,7 +68,7 @@ private void recordMetrics(final ObservableDoubleMeasurement measurement) {
* @param attributes attributes for the metric
*/
public void addMetrics(final String workerQueueName, final DoubleSupplier metricSupplier, final Attributes attributes) {
metricsMap.put(workerQueueName, new UsageMetric(metricSupplier, attributes));
metricsMap.computeIfAbsent(workerQueueName, k -> new ArrayList<>()).add(new UsageMetric(metricSupplier, attributes));
}

/**
Expand Down
7 changes: 4 additions & 3 deletions ...main/java/nl/aerius/taskmanager/scheduler/priorityqueue/PriorityTaskSchedulerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ public void addMetric(final IntSupplier countSupplier, final String workerQueueN
}

/**
* Adds collecting metrics to count the number of tasks waiting on the client queue.
*
* @param countSupplier
* @param workerQueueName
* @param clientQueueName
* @param countSupplier supplier that returns the active count for the given client queue name when called
* @param workerQueueName worker queue name
* @param clientQueueName client queue name
*/
public void addMetricWaiting(final IntSupplier countSupplier, final String workerQueueName, final String clientQueueName) {
waitingMetrics.put(clientQueueName, OpenTelemetryMetrics.METER
Expand Down
Loading