[Improvement-Metrics][master] Add missing metrics to Master module

Author: sanjana2505006

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/lifecycle/handler/TaskTimeoutLifecycleEventHandler.java

@@ -54,6 +54,7 @@ public void handle(final ITaskStateAction taskStateAction,
             // The task instance is not active, means it is already finished.
             return;
         }
+        org.apache.dolphinscheduler.server.master.metrics.TaskMetrics.incTaskInstanceByState("timeout");
         final String taskName = taskExecutionRunnable.getName();
         final TaskTimeoutStrategy timeoutNotifyStrategy = taskTimeoutLifecycleEvent.getTimeoutStrategy();
         if (timeoutNotifyStrategy == null) {

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/statemachine/AbstractTaskStateAction.java

@@ -46,6 +46,7 @@
 import org.apache.dolphinscheduler.server.master.engine.task.runnable.ITaskExecutionRunnable;
 import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.event.WorkflowTopologyLogicalTransitionWithTaskFinishLifecycleEvent;
 import org.apache.dolphinscheduler.server.master.engine.workflow.runnable.IWorkflowExecutionRunnable;
+import org.apache.dolphinscheduler.server.master.metrics.TaskMetrics;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -109,6 +110,7 @@ public void onFatalEvent(final IWorkflowExecutionRunnable workflowExecutionRunna
 
         if (taskExecutionRunnable.isTaskInstanceCanRetry()) {
             taskExecutionRunnable.getWorkflowEventBus().publish(TaskRetryLifecycleEvent.of(taskExecutionRunnable));
+            TaskMetrics.incTaskInstanceByState("retry");
             return;
         }
 
@@ -131,6 +133,7 @@ private void persistentTaskInstanceFatalEventToDB(final ITaskExecutionRunnable t
         taskInstance.setState(TaskExecutionStatus.FAILURE);
         taskInstance.setEndTime(taskFatalEvent.getEndTime());
         taskInstanceDao.updateById(taskInstance);
+        TaskMetrics.incTaskInstanceByState("fail");
     }
 
     @Override
@@ -141,6 +144,7 @@ public void onDispatchedEvent(final IWorkflowExecutionRunnable workflowExecution
         taskInstance.setState(DISPATCH);
         taskInstance.setHost(taskDispatchedEvent.getExecutorHost());
         taskInstanceDao.updateById(taskInstance);
+        TaskMetrics.incTaskInstanceByState("dispatch");
     }
 
     @Override
@@ -196,7 +200,7 @@ private void persistentTaskInstanceKilledEventToDB(final ITaskExecutionRunnable
         taskInstance.setState(TaskExecutionStatus.KILL);
         taskInstance.setEndTime(taskKilledEvent.getEndTime());
         taskInstanceDao.updateById(taskInstance);
-
+        TaskMetrics.incTaskInstanceByState("kill");
     }
 
     @Override
@@ -208,6 +212,7 @@ public void onFailedEvent(final IWorkflowExecutionRunnable workflowExecutionRunn
 
         if (taskExecutionRunnable.isTaskInstanceCanRetry()) {
             taskExecutionRunnable.getWorkflowEventBus().publish(TaskRetryLifecycleEvent.of(taskExecutionRunnable));
+            TaskMetrics.incTaskInstanceByState("retry");
             return;
         }
         // If all successors are condition tasks, then the task will not be marked as failure.
@@ -229,6 +234,7 @@ private void persistentTaskInstanceFailedEventToDB(final ITaskExecutionRunnable
         taskInstance.setState(TaskExecutionStatus.FAILURE);
         taskInstance.setEndTime(taskFailedEvent.getEndTime());
         taskInstanceDao.updateById(taskInstance);
+        TaskMetrics.incTaskInstanceByState("fail");
     }
 
     @Override
@@ -259,6 +265,7 @@ protected void persistentTaskInstanceSuccessEventToDB(final ITaskExecutionRunnab
                 JSONUtils.toJsonString(taskSuccessEvent.getVarPool()));
         taskInstance.setVarPool(VarPoolUtils.serializeVarPool(finalVarPool));
         taskInstanceDao.updateById(taskInstance);
+        TaskMetrics.incTaskInstanceByState("success");
     }
 
     /**

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/runnable/WorkflowExecutionRunnableFactory.java

@@ -52,8 +52,12 @@ public class WorkflowExecutionRunnableFactory {
      */
     @Transactional
     public IWorkflowExecutionRunnable createWorkflowExecuteRunnable(Command command) {
+        long startTime = System.currentTimeMillis();
         deleteCommandOrThrow(command);
-        return doCreateWorkflowExecutionRunnable(command);
+        IWorkflowExecutionRunnable workflowExecutionRunnable = doCreateWorkflowExecutionRunnable(command);
+        org.apache.dolphinscheduler.server.master.metrics.WorkflowInstanceMetrics
+                .recordWorkflowInstanceGenerateTime(System.currentTimeMillis() - startTime);
+        return workflowExecutionRunnable;
     }
 
     /**

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/statemachine/AbstractWorkflowStateAction.java

@@ -172,6 +172,9 @@ protected void transformWorkflowInstanceState(final IWorkflowExecutionRunnable w
             workflowInstanceDao.updateById(workflowInstance);
             log.info("Success set WorkflowExecuteRunnable: {} state from: {} to {}",
                     workflowInstance.getName(), originState.name(), targetState.name());
+            WorkflowInstanceMetrics.incWorkflowInstanceByStateAndWorkflowDefinitionCode(
+                    targetState.name(),
+                    String.valueOf(workflowInstance.getWorkflowDefinitionCode()));
         } catch (Exception ex) {
             workflowInstance.setState(originState);
             throw ex;