Improvements to metrics reporting

source/taskmanager/src/main/java/nl/aerius/taskmanager/metrics/OpenTelemetryMetrics.java

@@ -39,36 +39,36 @@ private OpenTelemetryMetrics() {
 
   public static Attributes workerAttributes(final String workerType) {
     return Attributes.builder()
-        .put(WORKER_TYPE_ATTRIBUTE, workerIdentifier(workerType))
+        .put(WORKER_TYPE_ATTRIBUTE, onlyLastPart(workerType))
         .build();
   }
 
   public static Attributes workerAttributes(final String workerType, final String atttributeName, final String attributeValue) {
     return Attributes.builder()
-        .put(WORKER_TYPE_ATTRIBUTE, workerIdentifier(workerType))
+        .put(WORKER_TYPE_ATTRIBUTE, onlyLastPart(workerType))
         .put(atttributeName, attributeValue)
         .build();
   }
 
   public static Attributes queueAttributes(final String workerQueueName, final String queueName) {
     return Attributes.builder()
-        .put(WORKER_TYPE_ATTRIBUTE, workerIdentifier(workerQueueName))
-        .put(QUEUE_ATTRIBUTE, queueName)
+        .put(WORKER_TYPE_ATTRIBUTE, onlyLastPart(workerQueueName))
+        .put(QUEUE_ATTRIBUTE, onlyLastPart(queueName))
         .build();
   }
 
   public static Attributes queueAttributes(final String workerQueueName, final String queueName, final String atttributeName,
       final String attributeValue) {
     return Attributes.builder()
-        .put(WORKER_TYPE_ATTRIBUTE, workerIdentifier(workerQueueName))
-        .put(QUEUE_ATTRIBUTE, queueName)
+        .put(WORKER_TYPE_ATTRIBUTE, onlyLastPart(workerQueueName))
+        .put(QUEUE_ATTRIBUTE, onlyLastPart(queueName))
         .put(atttributeName, attributeValue)
         .build();
   }
 
-  private static String workerIdentifier(final String workerQueueName) {
-    final int workerTypeIndex = workerQueueName.lastIndexOf('.');
+  private static String onlyLastPart(final String name) {
+    final int lastIndex = name.lastIndexOf('.');
 
-    return (workerTypeIndex > 0 ? workerQueueName.substring(workerTypeIndex + 1) : workerQueueName).toLowerCase(Locale.ROOT);
+    return (lastIndex < 0 ? name : name.substring(lastIndex + 1)).toLowerCase(Locale.ROOT);
   }
 }

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", "");
+    loadUsageMetricsReporter = new UsageMetricsReporter(meter, "aer.taskmanager.worker.load", "Report average worker load");
   }
 
   /**

source/taskmanager/src/main/java/nl/aerius/taskmanager/metrics/UsageMetricsWrapper.java

@@ -30,8 +30,8 @@ class UsageMetricsWrapper {
 
   public UsageMetricsWrapper(final Meter meter, final String metricPrefix, final boolean hasWaiting) {
     this.hasWaiting = hasWaiting;
-    limitReporter = new UsageMetricsReporter(meter, metricPrefix + ".worker.limit", "");
-    usageReporter = new UsageMetricsReporter(meter, metricPrefix + ".worker.usage", "");
+    limitReporter = new UsageMetricsReporter(meter, metricPrefix + ".worker.limit", "Report nunber of workers available");
+    usageReporter = new UsageMetricsReporter(meter, metricPrefix + ".worker.usage", "Report worker usage");
   }
 
   public void add(final UsageMetricsProvider provider) {

source/taskmanager/src/main/java/nl/aerius/taskmanager/scheduler/priorityqueue/PriorityTaskSchedulerMetrics.java

@@ -36,7 +36,7 @@ class PriorityTaskSchedulerMetrics {
   @Deprecated
   private static final String METRIC_PREFIX_LEGACY = "aer.taskmanager.running_client_size";
   private static final String METRIC_PREFIX = "aer.taskmanager.client.queue";
-  private static final String DESCRIPTION = "Number of tasks running for the client queue ";
+  private static final String DESCRIPTION = "Number of tasks running on client queues";
 
   private final Map<String, ObservableDoubleGauge> metrics = new HashMap<>();
   private final Map<String, ObservableDoubleGauge> usageMetrics = new HashMap<>();
@@ -52,13 +52,13 @@ class PriorityTaskSchedulerMetrics {
   public void addMetric(final IntSupplier countSupplier, final String workerQueueName, final String clientQueueName) {
     metrics.put(clientQueueName, OpenTelemetryMetrics.METER
         .gaugeBuilder(METRIC_PREFIX_LEGACY)
-        .setDescription(DESCRIPTION + clientQueueName)
+        .setDescription(DESCRIPTION)
         .buildWithCallback(
             result -> result.record(countSupplier.getAsInt(),
                 OpenTelemetryMetrics.queueAttributes(workerQueueName, clientQueueName, "state", "used"))));
     metrics.put(clientQueueName, OpenTelemetryMetrics.METER
         .gaugeBuilder(METRIC_PREFIX)
-        .setDescription(DESCRIPTION + clientQueueName)
+        .setDescription(DESCRIPTION)
         .buildWithCallback(
             result -> result.record(countSupplier.getAsInt(),
                 OpenTelemetryMetrics.queueAttributes(workerQueueName, clientQueueName, "state", "used"))));

source/taskmanager/src/test/java/nl/aerius/taskmanager/metrics/OpenTelemetryMetricsTest.java

@@ -36,7 +36,7 @@ void testWorkerAttributes() {
 
   @Test
   void testQueueAttributes() {
-    final Attributes attributes = OpenTelemetryMetrics.queueAttributes("aer.worker.OPS", "calculator");
+    final Attributes attributes = OpenTelemetryMetrics.queueAttributes("aer.worker.OPS", "aerius.worker.calculator");
 
     assertEquals("ops", attributes.get(OpenTelemetryMetrics.WORKER_TYPE_ATTRIBUTE), "Should have expected worker type attribute");
     assertEquals("calculator", attributes.get(OpenTelemetryMetrics.QUEUE_ATTRIBUTE), "Should have expected queue name attribute");