added first metric support

sterlp · sterlp · commit f2e0a0c6d4ec · 2025-03-20T21:31:25.000+01:00
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerService.java b/core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerService.java
@@ -25,6 +25,10 @@
 import org.sterl.spring.persistent_tasks.trigger.event.TriggerAddedEvent;
 import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
 
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.binder.BaseUnits;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import lombok.Getter;
@@ -51,11 +55,27 @@ public class SchedulerService {
     private final RunOrQueueComponent runOrQueue;
 
     private final TransactionTemplate trx;
+    
+    private final MeterRegistry meterRegistry;
 
     @PostConstruct
     public void start() {
         taskExecutor.start();
         editSchedulerStatus.checkinToRegistry(name, 0, taskExecutor.getMaxThreads());
+
+        Gauge.builder("persistent_tasks.scheduler." + name, 
+                taskExecutor, 
+                e -> e.countRunning())
+            .tags(Tags.of("thread", "running"))
+            .baseUnit(BaseUnits.TASKS)
+            .register(meterRegistry);
+        
+        Gauge.builder("persistent_tasks.scheduler." + name, 
+                taskExecutor, 
+                e -> e.getMaxThreads())
+            .tags(Tags.of("thread", "max"))
+            .baseUnit(BaseUnits.TASKS)
+            .register(meterRegistry);
     }
 
     public void setMaxThreads(int value) {
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/component/EditSchedulerStatusComponent.java b/core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/component/EditSchedulerStatusComponent.java
@@ -35,6 +35,7 @@ public SchedulerEntity checkinToRegistry(String name, int runningTasks, int maxT
         result.setTasksSlotCount(maxTasks);
 
         result.setLastPing(OffsetDateTime.now());
+
         log.debug("Ping {}", result);
         return schedulerRepository.save(result);
     }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/config/SchedulerConfig.java b/core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/config/SchedulerConfig.java
@@ -17,6 +17,7 @@
 import org.sterl.spring.persistent_tasks.scheduler.component.TaskExecutorComponent;
 import org.sterl.spring.persistent_tasks.trigger.TriggerService;
 
+import io.micrometer.core.instrument.MeterRegistry;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -48,6 +49,7 @@ default String name() {
     @Bean(name = "schedulerService", initMethod = "start", destroyMethod = "stop")
     SchedulerService schedulerService(
             TriggerService triggerService,
+            MeterRegistry meterRegistry,
             @Value("${spring.persistent-tasks.max-threads:10}") int maxThreads,
             EditSchedulerStatusComponent editSchedulerStatus,
             Optional<SchedulerCustomizer> customizer,
@@ -57,11 +59,16 @@ SchedulerService schedulerService(
         final var name = customizer.get().name();
         final var maxShutdownWaitTime = Duration.ofSeconds(10);
 
-        return newSchedulerService(name, triggerService, editSchedulerStatus, maxThreads, maxShutdownWaitTime, trx);
+        return newSchedulerService(name, meterRegistry, triggerService, editSchedulerStatus, maxThreads, maxShutdownWaitTime, trx);
     }
 
-    public static SchedulerService newSchedulerService(final String name, TriggerService triggerService,
-            EditSchedulerStatusComponent editSchedulerStatus, int maxThreads, final Duration maxShutdownWaitTime,
+    public static SchedulerService newSchedulerService(
+            String name,
+            MeterRegistry meterRegistry,
+            TriggerService triggerService,
+            EditSchedulerStatusComponent editSchedulerStatus, 
+            int maxThreads, 
+            Duration maxShutdownWaitTime,
             TransactionTemplate trx) {
         
         final var taskExecutor = new TaskExecutorComponent(name, triggerService, maxThreads);
@@ -74,6 +81,7 @@ public static SchedulerService newSchedulerService(final String name, TriggerSer
                 taskExecutor, 
                 editSchedulerStatus,
                 runOrQueue,
-                trx);
+                trx,
+                meterRegistry);
     }
 }
diff --git a/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/interceptor/TriggerMetricInterceptor.java b/core/src/main/java/org/sterl/spring/persistent_tasks/trigger/interceptor/TriggerMetricInterceptor.java
@@ -0,0 +1,66 @@
+package org.sterl.spring.persistent_tasks.trigger.interceptor;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+import org.sterl.spring.persistent_tasks.api.TriggerStatus;
+import org.sterl.spring.persistent_tasks.trigger.event.TriggerCanceledEvent;
+import org.sterl.spring.persistent_tasks.trigger.event.TriggerFailedEvent;
+import org.sterl.spring.persistent_tasks.trigger.event.TriggerSuccessEvent;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.Timer;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@RequiredArgsConstructor
+@Component
+@Slf4j
+public class TriggerMetricInterceptor {
+
+    private final MeterRegistry meterRegistry;
+    private final Map<String, Timer> cache = new ConcurrentHashMap<>(); 
+
+    @EventListener
+    public void onFailed(TriggerFailedEvent data) {
+        recordTime(data.key().getTaskName(), 
+                data.status(), 
+                data.getData().getRunningDurationInMs());
+    }
+    @EventListener
+    public void onSuccess(TriggerSuccessEvent data) {
+        recordTime(data.key().getTaskName(), 
+                data.status(), 
+                data.getData().getRunningDurationInMs());
+
+    }
+    @EventListener
+    public void onSuccess(TriggerCanceledEvent data) {
+        recordTime(data.key().getTaskName(), 
+                data.status(), 
+                data.getData().getRunningDurationInMs());
+    }
+    
+    private void recordTime(String name, TriggerStatus status, Long timeMs) {
+        if (timeMs == null) return;
+        final var key = name  + status;
+
+        try {
+            var timer = cache.get(key);
+            if (timer == null) {
+                timer = Timer.builder("persistent_tasks.task." + name)
+                             .tags(Tags.of("status", status.name()))
+                             .register(meterRegistry);
+                cache.put(key, timer);
+            }
+            timer.record(timeMs, TimeUnit.MICROSECONDS);
+        } catch (Exception e) {
+            log.error("Failed to update timer for {}", name, e);
+        }
+    }
+}
+
diff --git a/core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java b/core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java
@@ -33,6 +33,7 @@
 import org.sterl.spring.sample_app.SampleApp;
 import org.sterl.test.hibernate_asserts.HibernateAsserts;
 
+import io.micrometer.core.instrument.MeterRegistry;
 import jakarta.persistence.EntityManager;
 import lombok.RequiredArgsConstructor;
 
@@ -91,20 +92,24 @@ HibernateAsserts hibernateAsserts(EntityManager entityManager) {
         @Primary
         @Bean("schedulerA")
         @SuppressWarnings("resource")
-        SchedulerService schedulerA(TriggerService triggerService, EditSchedulerStatusComponent editSchedulerStatus,
+        SchedulerService schedulerA(TriggerService triggerService,
+                MeterRegistry meterRegistry,
+                EditSchedulerStatusComponent editSchedulerStatus,
                 TransactionTemplate trx) throws UnknownHostException {
 
             final var name = "schedulerA";
-            return SchedulerConfig.newSchedulerService(name, triggerService, editSchedulerStatus, 10, Duration.ZERO, trx);
+            return SchedulerConfig.newSchedulerService(name, meterRegistry, triggerService, editSchedulerStatus, 10, Duration.ZERO, trx);
         }
 
         @Bean
         @SuppressWarnings("resource")
-        SchedulerService schedulerB(TriggerService triggerService, EditSchedulerStatusComponent editSchedulerStatus,
+        SchedulerService schedulerB(TriggerService triggerService,
+                MeterRegistry meterRegistry,
+                EditSchedulerStatusComponent editSchedulerStatus,
                 TransactionTemplate trx) throws UnknownHostException {
 
             final var name = "schedulerB";
-            return SchedulerConfig.newSchedulerService(name, triggerService, editSchedulerStatus, 20, Duration.ZERO, trx);
+            return SchedulerConfig.newSchedulerService(name, meterRegistry, triggerService, editSchedulerStatus, 20, Duration.ZERO, trx);
         }
 
         /**
diff --git a/ui/src/scheduler/views/scheduler.view.tsx b/ui/src/scheduler/views/scheduler.view.tsx

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public SchedulerEntity checkinToRegistry(String name, int runningTasks, int maxT`
`35`	`35`	`result.setTasksSlotCount(maxTasks);`
`36`	`36`
`37`	`37`	`result.setLastPing(OffsetDateTime.now());`
	`38`	`+`
`38`	`39`	`log.debug("Ping {}", result);`
`39`	`40`	`return schedulerRepository.save(result);`
`40`	`41`	`}`