Fix overdue tasks metric to consider retryAt when the task status isn…

…'t idle (elastic#192603) In this PR, I'm fixing the runtime field used to calculate the number of overdue tasks so it considers `retryAt` field when tasks are in running or claiming status.
gergoabraham · Sep 13, 2024 · ed68d72 · ed68d72
1 parent 4297d1a
commit ed68d72
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/x-pack/plugins/task_manager/server/metrics/task_metrics_collector.test.ts b/x-pack/plugins/task_manager/server/metrics/task_metrics_collector.test.ts
@@ -143,8 +143,15 @@ describe('TaskManagerMetricsCollector', () => {
           type: 'long',
           script: {
             source: `
+                def taskStatus = doc['task.status'];
                 def runAt = doc['task.runAt'];
-                if(!runAt.empty) {
+
+                if (taskStatus.empty) {
+                  emit(0);
+                  return;
+                }
+
+                if(taskStatus == 'idle') {
                   emit((new Date().getTime() - runAt.value.getMillis()) / 1000);
                 } else {
                   def retryAt = doc['task.retryAt'];

diff --git a/x-pack/plugins/task_manager/server/metrics/task_metrics_collector.ts b/x-pack/plugins/task_manager/server/metrics/task_metrics_collector.ts
@@ -102,8 +102,15 @@ export class TaskManagerMetricsCollector implements ITaskEventEmitter<TaskLifecy
             type: 'long',
             script: {
               source: `
+                def taskStatus = doc['task.status'];
                 def runAt = doc['task.runAt'];
-                if(!runAt.empty) {
+
+                if (taskStatus.empty) {
+                  emit(0);
+                  return;
+                }
+
+                if(taskStatus == 'idle') {
                   emit((new Date().getTime() - runAt.value.getMillis()) / 1000);
                 } else {
                   def retryAt = doc['task.retryAt'];