extended MDC logger

Author: sterlp

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerService.java

@@ -169,7 +169,8 @@ public List<TriggerEntity> rescheduleAbandonedTasks(OffsetDateTime timeout) {
                 .toList();
 
         int running = triggerService.markTriggersAsRunning(runningKeys, name);
-        log.debug("({}) - {} trigger(s) are running on {} schedulers", running, runningKeys, schedulers);
+        log.debug("({}) - {} trigger(s) are running on {} schedulers", 
+                running, runningKeys, schedulers);
         return triggerService.rescheduleAbandonedTasks(timeout);
     }
 

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/api/SchedulerResource.java

@@ -25,8 +25,7 @@ public class SchedulerResource {
     public List<SchedulerEntity> listAll() {
         return anyService.listAll();
     }
-    
-    
+
     @GetMapping("/schedulers/{name}")
     public ResponseEntity<SchedulerEntity> get(@PathVariable("name") String name) {
         return ResponseEntity.of(anyService.findStatus(name));

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/interceptor/MdcTriggerInterceptor.java

@@ -13,22 +13,33 @@
 @Component
 public class MdcTriggerInterceptor {
 
+    public static final String TASK_RUNNING_ON = "taskRunningOn";
+    public static final String TASK_START = "taskStart";
     public static final String TASK_NAME = "taskName";
+    public static final String TASK_KEY = "taskKey";
     public static final String TASK_ID = "taskId";
 
     @EventListener
     public void beforeRun(TriggerRunningEvent data) {
+        MDC.put(TASK_RUNNING_ON, data.runningOn());
+        MDC.put(TASK_START, data.getData().getStart() + "");
         MDC.put(TASK_NAME, data.key().getTaskName());
-        MDC.put(TASK_ID, data.key().getId());
+        MDC.put(TASK_KEY, data.key().getId());
+        MDC.put(TASK_ID, data.id() + "");
     }
     @EventListener
     public void onFailed(TriggerFailedEvent data) {
-        MDC.remove(TASK_NAME);
-        MDC.remove(TASK_ID);
+        clearMdc();
     }
     @EventListener
     public void onSuccess(TriggerSuccessEvent data) {
+        clearMdc();
+    }
+    private void clearMdc() {
+        MDC.remove(TASK_RUNNING_ON);
+        MDC.remove(TASK_START);
         MDC.remove(TASK_NAME);
+        MDC.remove(TASK_KEY);
         MDC.remove(TASK_ID);
     }
 }