Add rpc benchmark test (#14797)

.github/CODEOWNERS

@@ -33,7 +33,7 @@
 /dolphinscheduler-master/ @caishunfeng @SbloodyS @ruanwenjun
 /dolphinscheduler-worker/ @caishunfeng @SbloodyS @ruanwenjun
 /dolphinscheduler-service/ @caishunfeng
-/dolphinscheduler-remote/ @caishunfeng
+/dolphinscheduler-extract/ @caishunfeng @ruanwenjun
 /dolphinscheduler-spi/ @caishunfeng
 /dolphinscheduler-task-plugin/ @caishunfeng @SbloodyS @zhuangchong
 /dolphinscheduler-tools/ @caishunfeng @SbloodyS @zhongjiajie @EricGao888

docs/docs/en/about/glossary.md

@@ -61,7 +61,7 @@ process fails and ends
 
 - dolphinscheduler-dao provides operations such as database access.
 
-- dolphinscheduler-remote client and server based on netty
+- dolphinscheduler-extract dolphinscheduler extract module, providing master/worker/alert sdk.
 
 - dolphinscheduler-service service module, including Quartz, Zookeeper, log client access service, easy to call server
   module and api module

docs/docs/zh/about/glossary.md

@@ -45,7 +45,7 @@
 
 - dolphinscheduler-dao 提供数据库访问等操作。
 
-- dolphinscheduler-remote 基于 netty 的客户端、服务端
+- dolphinscheduler-extract extract模块，包含master/worker/alert的sdk
 
 - dolphinscheduler-service service模块，包含Quartz、Zookeeper、日志客户端访问服务，便于server模块和api模块调用
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/CacheEvictAspect.java

@@ -147,7 +147,7 @@ public class CacheEvictAspect {
                 return;
             }
             for (Server server : serverList) {
-                IMasterCacheService masterCacheService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                IMasterCacheService masterCacheService = SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(server.getHost() + ":" + server.getPort(), IMasterCacheService.class);
                 masterCacheService.cacheExpire(new CacheExpireRequest(cacheType, cacheKey));
             }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteFunction.java

@@ -58,7 +58,7 @@ public class PauseExecuteFunction implements ExecuteFunction<PauseExecuteRequest
         try {
             // todo: direct call the workflow instance pause method
             ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                    SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                    SingletonJdkDynamicRpcClientProxyFactory
                             .getProxyClient(workflowInstance.getHost(), ITaskInstanceExecutionEventListener.class);
             iTaskInstanceExecutionEventListener.onWorkflowInstanceInstanceStateChange(
                     new WorkflowInstanceStateChangeEvent(

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopExecuteFunction.java

@@ -59,8 +59,8 @@ public class StopExecuteFunction implements ExecuteFunction<StopRequest, StopRes
             try {
                 // todo: direct call the workflow instance stop method
                 ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                        SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                        SingletonJdkDynamicRpcClientProxyFactory.getProxyClient(workflowInstance.getHost(),
-                                .getProxyClient(workflowInstance.getHost(), ITaskInstanceExecutionEventListener.class);
+                                ITaskInstanceExecutionEventListener.class);
                 iTaskInstanceExecutionEventListener.onWorkflowInstanceInstanceStateChange(
                         new WorkflowInstanceStateChangeEvent(
                                 workflowInstance.getId(), 0, workflowInstance.getState(), workflowInstance.getId(), 0));

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java

@@ -656,7 +656,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
             WorkflowInstanceStateChangeEvent workflowStateEventChangeRequest = new WorkflowInstanceStateChangeEvent(
                     processInstance.getId(), 0, processInstance.getState(), processInstance.getId(), 0);
             ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                    SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                    SingletonJdkDynamicRpcClientProxyFactory
                             .getProxyClient(processInstance.getHost(), ITaskInstanceExecutionEventListener.class);
             iTaskInstanceExecutionEventListener.onWorkflowInstanceInstanceStateChange(workflowStateEventChangeRequest);
             putMsg(result, Status.SUCCESS);
@@ -684,7 +684,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
         taskGroupQueue.setForceStart(Flag.YES.getCode());
         processService.updateTaskGroupQueue(taskGroupQueue);
         log.info("Sending force start command to master: {}.", processInstance.getHost());
-        ILogicTaskInstanceOperator iLogicTaskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+        ILogicTaskInstanceOperator iLogicTaskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                 .getProxyClient(processInstance.getHost(), ILogicTaskInstanceOperator.class);
         iLogicTaskInstanceOperator.forceStartTaskInstance(
                 new TaskInstanceForceStartRequest(processInstance.getId(), taskGroupQueue.getTaskId()));
@@ -1152,7 +1152,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
             log.error("Process instance does not exist, processInstanceId:{}.", processInstanceId);
             return null;
         }
-        IWorkflowInstanceService iWorkflowInstanceService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+        IWorkflowInstanceService iWorkflowInstanceService = SingletonJdkDynamicRpcClientProxyFactory
                 .getProxyClient(processInstance.getHost(), IWorkflowInstanceService.class);
         return iWorkflowInstanceService.getWorkflowExecutingData(processInstanceId);
     }
@@ -1189,7 +1189,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
         taskExecuteStartMessage.setStartParams(startParams);
         taskExecuteStartMessage.setDryRun(dryRun);
 
-        IStreamingTaskOperator streamingTaskOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+        IStreamingTaskOperator streamingTaskOperator = SingletonJdkDynamicRpcClientProxyFactory
                 .getProxyClient(server.getHost() + ":" + server.getPort(), IStreamingTaskOperator.class);
         StreamingTaskTriggerResponse streamingTaskTriggerResponse =
                 streamingTaskOperator.triggerStreamingTask(taskExecuteStartMessage);

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java

@@ -225,7 +225,7 @@ public class LoggerServiceImpl extends BaseServiceImpl implements LoggerService
 
         String logContent = null;
         if (TaskUtils.isLogicTask(taskInstance.getTaskType())) {
-            IMasterLogService masterLogService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+            IMasterLogService masterLogService = SingletonJdkDynamicRpcClientProxyFactory
                     .getProxyClient(taskInstance.getHost(), IMasterLogService.class);
             try {
                 LogicTaskInstanceLogPageQueryRequest logicTaskInstanceLogPageQueryRequest =
@@ -237,7 +237,7 @@ public class LoggerServiceImpl extends BaseServiceImpl implements LoggerService
                 log.error("Query LogicTaskInstance log error", ex);
             }
         } else {
-            IWorkerLogService iWorkerLogService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+            IWorkerLogService iWorkerLogService = SingletonJdkDynamicRpcClientProxyFactory
                     .getProxyClient(host, IWorkerLogService.class);
             try {
                 TaskInstanceLogPageQueryRequest taskInstanceLogPageQueryRequest =
@@ -282,7 +282,7 @@ public class LoggerServiceImpl extends BaseServiceImpl implements LoggerService
 
         byte[] logBytes = new byte[0];
         if (TaskUtils.isLogicTask(taskInstance.getTaskType())) {
-            IMasterLogService masterLogService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+            IMasterLogService masterLogService = SingletonJdkDynamicRpcClientProxyFactory
                     .getProxyClient(taskInstance.getHost(), IMasterLogService.class);
             try {
                 LogicTaskInstanceLogFileDownloadRequest logicTaskInstanceLogFileDownloadRequest =
@@ -294,7 +294,7 @@ public class LoggerServiceImpl extends BaseServiceImpl implements LoggerService
                 log.error("Query LogicTaskInstance log error", ex);
             }
         } else {
-            IWorkerLogService iWorkerLogService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+            IWorkerLogService iWorkerLogService = SingletonJdkDynamicRpcClientProxyFactory
                     .getProxyClient(host, IWorkerLogService.class);
             try {
                 TaskInstanceLogFileDownloadRequest taskInstanceLogFileDownloadRequest =

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/MetricsCleanUpServiceImpl.java

@@ -50,7 +50,7 @@ public class MetricsCleanUpServiceImpl implements MetricsCleanUpService {
     private void cleanUpWorkflowMetrics(Server server, Long workflowDefinitionCode) {
         try {
             IWorkflowInstanceService iWorkflowInstanceService =
-                    SingletonJdkDynamicRpcClientProxyFactory.getInstance().getProxyClient(
+                    SingletonJdkDynamicRpcClientProxyFactory.getProxyClient(
                             String.format("%s:%s", server.getHost(), server.getPort()), IWorkflowInstanceService.class);
             iWorkflowInstanceService.clearWorkflowMetrics(workflowDefinitionCode);
         } catch (Exception e) {

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java

@@ -290,7 +290,7 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst
             return result;
         }
         IStreamingTaskInstanceOperator streamingTaskInstanceOperator =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskInstance.getHost(), IStreamingTaskInstanceOperator.class);
         TaskInstanceTriggerSavepointResponse taskInstanceTriggerSavepointResponse =
                 streamingTaskInstanceOperator.triggerSavepoint(new TaskInstanceTriggerSavepointRequest(taskInstanceId));
@@ -322,7 +322,7 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst
         }
 
         // todo: we only support streaming task for now
-        ITaskInstanceOperator iTaskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+        ITaskInstanceOperator iTaskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                 .getProxyClient(taskInstance.getHost(), ITaskInstanceOperator.class);
         TaskInstanceKillResponse taskInstanceKillResponse =
                 iTaskInstanceOperator.killTask(new TaskInstanceKillRequest(taskInstanceId));
@@ -381,11 +381,11 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst
             // delete log
             if (StringUtils.isNotEmpty(taskInstance.getLogPath())) {
                 if (TaskUtils.isLogicTask(taskInstance.getTaskType())) {
-                    IMasterLogService masterLogService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                    IMasterLogService masterLogService = SingletonJdkDynamicRpcClientProxyFactory
                             .getProxyClient(taskInstance.getHost(), IMasterLogService.class);
                     masterLogService.removeLogicTaskInstanceLog(taskInstance.getLogPath());
                 } else {
-                    IWorkerLogService workerLogService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                    IWorkerLogService workerLogService = SingletonJdkDynamicRpcClientProxyFactory
                             .getProxyClient(taskInstance.getHost(), IWorkerLogService.class);
                     workerLogService.removeTaskInstanceLog(taskInstance.getLogPath());
                 }

dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/JdkDynamicRpcClientProxyFactory.java

@@ -21,9 +21,16 @@ import org.apache.dolphinscheduler.extract.base.NettyRemotingClient;
 import org.apache.dolphinscheduler.extract.base.utils.Host;
 
 import java.lang.reflect.Proxy;
+import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import lombok.SneakyThrows;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+
 /**
  * This class is used to create a proxy client which will transform local method invocation to remove invocation.
  */
@@ -31,21 +38,34 @@ public class JdkDynamicRpcClientProxyFactory implements IRpcClientProxyFactory {
 
     private final NettyRemotingClient nettyRemotingClient;
 
-    // todo: use guava cache to avoid memory leak
+    private static final LoadingCache<String, Map<String, Object>> proxyClientCache = CacheBuilder.newBuilder()
-    private final Map<String, Map<String, Object>> proxyClientCache = new ConcurrentHashMap<>();
+            // expire here to remove dead host
+            .expireAfterAccess(Duration.ofHours(1))
+            .build(new CacheLoader<String, Map<String, Object>>() {
+
+                @Override
+                public Map<String, Object> load(String key) {
+                    return new ConcurrentHashMap<>();
+                }
+            });
 
     public JdkDynamicRpcClientProxyFactory(NettyRemotingClient nettyRemotingClient) {
         this.nettyRemotingClient = nettyRemotingClient;
     }
 
+    @SneakyThrows
     @SuppressWarnings("unchecked")
     @Override
     public <T> T getProxyClient(String serverHost, Class<T> clientInterface) {
-        return (T) proxyClientCache
+        return (T) proxyClientCache.get(serverHost)
-                .computeIfAbsent(serverHost, key -> new ConcurrentHashMap<>())
+                .computeIfAbsent(clientInterface.getName(), key -> newProxyClient(serverHost, clientInterface));
-                .computeIfAbsent(clientInterface.getName(),
+    }
-                        key -> Proxy.newProxyInstance(
+
-                                clientInterface.getClassLoader(), new Class[]{clientInterface},
+    @SuppressWarnings("unchecked")
-                                new ClientInvocationHandler(Host.of(serverHost), nettyRemotingClient)));
+    private <T> T newProxyClient(String serverHost, Class<T> clientInterface) {
+        return (T) Proxy.newProxyInstance(
+                clientInterface.getClassLoader(),
+                new Class[]{clientInterface},
+                new ClientInvocationHandler(Host.of(serverHost), nettyRemotingClient));
     }
 }

dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/SingletonJdkDynamicRpcClientProxyFactory.java

@@ -20,17 +20,13 @@ package org.apache.dolphinscheduler.extract.base.client;
 import org.apache.dolphinscheduler.extract.base.NettyRemotingClientFactory;
 import org.apache.dolphinscheduler.extract.base.config.NettyClientConfig;
 
-public class SingletonJdkDynamicRpcClientProxyFactory extends JdkDynamicRpcClientProxyFactory {
+public class SingletonJdkDynamicRpcClientProxyFactory {
 
-    private static final SingletonJdkDynamicRpcClientProxyFactory INSTANCE =
+    private static final JdkDynamicRpcClientProxyFactory INSTANCE = new JdkDynamicRpcClientProxyFactory(
-            new SingletonJdkDynamicRpcClientProxyFactory();
+            NettyRemotingClientFactory.buildNettyRemotingClient(new NettyClientConfig()));
 
-    private SingletonJdkDynamicRpcClientProxyFactory() {
+    public static <T> T getProxyClient(String serverAddress, Class<T> clazz) {
-        super(NettyRemotingClientFactory.buildNettyRemotingClient(new NettyClientConfig()));
+        return INSTANCE.getProxyClient(serverAddress, clazz);
-    }
-
-    public static SingletonJdkDynamicRpcClientProxyFactory getInstance() {
-        return INSTANCE;
     }
 
 }

dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/server/JdkDynamicServerHandler.java

@@ -96,7 +96,7 @@ public class JdkDynamicServerHandler extends ChannelInboundHandlerAdapter {
                     StandardRpcRequest standardRpcRequest =
                             JsonSerializer.deserialize(transporter.getBody(), StandardRpcRequest.class);
                     Object[] args;
-                    if (standardRpcRequest.getArgs().length == 0) {
+                    if (standardRpcRequest.getArgs() == null || standardRpcRequest.getArgs().length == 0) {
                         args = null;
                     } else {
                         args = new Object[standardRpcRequest.getArgs().length];

dolphinscheduler-extract/dolphinscheduler-extract-base/src/test/java/org/apache/dolphinscheduler/extract/base/client/SingletonJdkDynamicRpcClientProxyFactoryTest.java

@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.extract.base.client;
+
+import org.apache.dolphinscheduler.extract.base.NettyRemotingServer;
+import org.apache.dolphinscheduler.extract.base.RpcMethod;
+import org.apache.dolphinscheduler.extract.base.RpcService;
+import org.apache.dolphinscheduler.extract.base.config.NettyServerConfig;
+import org.apache.dolphinscheduler.extract.base.server.SpringServerMethodInvokerDiscovery;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class SingletonJdkDynamicRpcClientProxyFactoryTest {
+
+    private NettyRemotingServer nettyRemotingServer;
+
+    @BeforeEach
+    public void setUp() {
+        nettyRemotingServer = new NettyRemotingServer(new NettyServerConfig(12345));
+        nettyRemotingServer.start();
+
+        new SpringServerMethodInvokerDiscovery(nettyRemotingServer)
+                .postProcessAfterInitialization(new IServiceImpl(), "iServiceImpl");
+    }
+
+    @Test
+    public void getProxyClient() {
+        IService proxyClient =
+                SingletonJdkDynamicRpcClientProxyFactory.getProxyClient("localhost:12345", IService.class);
+        Assertions.assertNotNull(proxyClient);
+    }
+
+    @Test
+    public void testPing() {
+        IService proxyClient =
+                SingletonJdkDynamicRpcClientProxyFactory.getProxyClient("localhost:12345", IService.class);
+        String ping = proxyClient.ping("ping");
+        Assertions.assertEquals("pong", ping);
+    }
+
+    @Test
+    public void testVoid() {
+        IService proxyClient =
+                SingletonJdkDynamicRpcClientProxyFactory.getProxyClient("localhost:12345", IService.class);
+        Assertions.assertDoesNotThrow(proxyClient::voidMethod);
+    }
+
+    @AfterEach
+    public void tearDown() {
+        nettyRemotingServer.close();
+    }
+
+    @RpcService
+    public interface IService {
+
+        @RpcMethod
+        String ping(String ping);
+
+        @RpcMethod
+        void voidMethod();
+    }
+
+    public static class IServiceImpl implements IService {
+
+        @Override
+        public String ping(String ping) {
+            return "pong";
+        }
+
+        @Override
+        public void voidMethod() {
+            System.out.println("void method");
+        }
+    }
+
+}

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskDelayEventHandler.java

@@ -114,7 +114,7 @@ public class TaskDelayEventHandler implements TaskEventHandler {
     private void sendAckToWorker(TaskEvent taskEvent) {
         // If event handle success, send ack to worker to otherwise the worker will retry this event
         ITaskInstanceExecutionEventAckListener instanceExecutionEventAckListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskEvent.getWorkerAddress(), ITaskInstanceExecutionEventAckListener.class);
         instanceExecutionEventAckListener.handleTaskInstanceExecutionRunningEventAck(
                 TaskInstanceExecutionRunningEventAck.success(taskEvent.getTaskInstanceId()));

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskResultEventHandler.java

@@ -116,7 +116,7 @@ public class TaskResultEventHandler implements TaskEventHandler {
 
     public void sendAckToWorker(TaskEvent taskEvent) {
         ITaskInstanceExecutionEventAckListener instanceExecutionEventAckListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskEvent.getWorkerAddress(), ITaskInstanceExecutionEventAckListener.class);
         instanceExecutionEventAckListener.handleTaskInstanceExecutionFinishEventAck(
                 TaskInstanceExecutionFinishEventAck.success(taskEvent.getTaskInstanceId()));

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRunningEventHandler.java

@@ -110,7 +110,7 @@ public class TaskRunningEventHandler implements TaskEventHandler {
     private void sendAckToWorker(TaskEvent taskEvent) {
         // If event handle success, send ack to worker to otherwise the worker will retry this event
         ITaskInstanceExecutionEventAckListener instanceExecutionEventAckListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskEvent.getWorkerAddress(), ITaskInstanceExecutionEventAckListener.class);
         instanceExecutionEventAckListener.handleTaskInstanceExecutionRunningEventAck(
                 TaskInstanceExecutionRunningEventAck.success(taskEvent.getTaskInstanceId()));

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskUpdatePidEventHandler.java

@@ -94,7 +94,7 @@ public class TaskUpdatePidEventHandler implements TaskEventHandler {
     private void sendAckToWorker(TaskEvent taskEvent) {
         // If event handle success, send ack to worker to otherwise the worker will retry this event
         ITaskInstanceExecutionEventAckListener instanceExecutionEventAckListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskEvent.getWorkerAddress(), ITaskInstanceExecutionEventAckListener.class);
         instanceExecutionEventAckListener.handleTaskInstanceExecutionInfoEventAck(
                 TaskInstanceExecutionInfoEventAck.success(taskEvent.getTaskInstanceId()));

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StreamTaskExecuteRunnable.java

@@ -473,7 +473,7 @@ public class StreamTaskExecuteRunnable implements Runnable {
     private void sendAckToWorker(TaskEvent taskEvent) {
         // If event handle success, send ack to worker to otherwise the worker will retry this event
         ITaskInstanceExecutionEventAckListener instanceExecutionEventAckListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskEvent.getWorkerAddress(), ITaskInstanceExecutionEventAckListener.class);
         if (taskEvent.getEvent() == TaskEventType.RUNNING) {
             log.error("taskEvent.getChannel() is null, taskEvent:{}", taskEvent);

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java

@@ -60,6 +60,7 @@ import org.apache.dolphinscheduler.dao.utils.TaskCacheUtils;
 import org.apache.dolphinscheduler.extract.base.client.SingletonJdkDynamicRpcClientProxyFactory;
 import org.apache.dolphinscheduler.extract.master.ILogicTaskInstanceOperator;
 import org.apache.dolphinscheduler.extract.master.transportor.TaskInstanceWakeupRequest;
+import org.apache.dolphinscheduler.extract.worker.ITaskInstanceOperator;
 import org.apache.dolphinscheduler.extract.worker.transportor.UpdateWorkflowHostRequest;
 import org.apache.dolphinscheduler.extract.worker.transportor.UpdateWorkflowHostResponse;
 import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult;
@@ -466,7 +467,7 @@ public class WorkflowExecuteRunnable implements IWorkflowExecuteRunnable {
         } else {
             ProcessInstance processInstance =
                     processService.findProcessInstanceById(nextTaskInstance.getProcessInstanceId());
-            ILogicTaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+            ILogicTaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                     .getProxyClient(processInstance.getHost(), ILogicTaskInstanceOperator.class);
             taskInstanceOperator.wakeupTaskInstance(
                     new TaskInstanceWakeupRequest(processInstance.getId(), nextTaskInstance.getId()));
@@ -1385,10 +1386,9 @@ public class WorkflowExecuteRunnable implements IWorkflowExecuteRunnable {
             return false;
         }
         try {
-            org.apache.dolphinscheduler.extract.worker.ITaskInstanceOperator iTaskInstanceOperator =
+            ITaskInstanceOperator iTaskInstanceOperator =
-                    SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                    SingletonJdkDynamicRpcClientProxyFactory
-                            .getProxyClient(taskInstance.getHost(),
+                            .getProxyClient(taskInstance.getHost(), ITaskInstanceOperator.class);
-                                    org.apache.dolphinscheduler.extract.worker.ITaskInstanceOperator.class);
             UpdateWorkflowHostResponse updateWorkflowHostResponse = iTaskInstanceOperator.updateWorkflowInstanceHost(
                     new UpdateWorkflowHostRequest(taskInstance.getId(), masterConfig.getMasterAddress()));
             if (!updateWorkflowHostResponse.isSuccess()) {

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java

@@ -226,7 +226,7 @@ public class WorkflowExecuteThreadPool extends ThreadPoolTaskExecutor {
             return;
         }
         ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(processInstanceHost, ITaskInstanceExecutionEventListener.class);
 
         WorkflowInstanceStateChangeEvent workflowInstanceStateChangeEvent = new WorkflowInstanceStateChangeEvent(

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/dispatcher/MasterTaskDispatcher.java

@@ -51,7 +51,7 @@ public class MasterTaskDispatcher extends BaseTaskDispatcher {
     protected void doDispatch(TaskExecuteRunnable taskExecuteRunnable) throws TaskDispatchException {
         TaskExecutionContext taskExecutionContext = taskExecuteRunnable.getTaskExecutionContext();
         try {
-            ILogicTaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+            ILogicTaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                     .getProxyClient(taskExecutionContext.getHost(), ILogicTaskInstanceOperator.class);
             LogicTaskDispatchResponse logicTaskDispatchResponse = taskInstanceOperator
                     .dispatchLogicTask(new LogicTaskDispatchRequest(taskExecuteRunnable.getTaskExecutionContext()));

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/dispatcher/WorkerTaskDispatcher.java

@@ -56,7 +56,7 @@ public class WorkerTaskDispatcher extends BaseTaskDispatcher {
     protected void doDispatch(TaskExecuteRunnable taskExecuteRunnable) throws TaskDispatchException {
         TaskExecutionContext taskExecutionContext = taskExecuteRunnable.getTaskExecutionContext();
         try {
-            ITaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+            ITaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                     .getProxyClient(taskExecutionContext.getHost(), ITaskInstanceOperator.class);
             TaskInstanceDispatchResponse taskInstanceDispatchResponse = taskInstanceOperator
                     .dispatchTask(new TaskInstanceDispatchRequest(taskExecuteRunnable.getTaskExecutionContext()));

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/message/LogicTaskInstanceExecuteRunningEventSender.java

@@ -34,7 +34,7 @@ public class LogicTaskInstanceExecuteRunningEventSender
     @Override
     public void sendMessage(TaskInstanceExecutionRunningEvent taskInstanceExecutionRunningEvent) {
         ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskInstanceExecutionRunningEvent.getHost(),
                                 ITaskInstanceExecutionEventListener.class);
         iTaskInstanceExecutionEventListener.onTaskInstanceExecutionRunning(taskInstanceExecutionRunningEvent);

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/message/LogicTaskInstanceExecutionFinishEventSender.java

@@ -32,7 +32,7 @@ public class LogicTaskInstanceExecutionFinishEventSender
     @Override
     public void sendMessage(TaskInstanceExecutionFinishEvent message) {
         ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(message.getHost(), ITaskInstanceExecutionEventListener.class);
         iTaskInstanceExecutionEventListener.onTaskInstanceExecutionFinish(message);
     }

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/LogicTaskExecuteRunnableKillOperator.java

@@ -45,7 +45,7 @@ public class LogicTaskExecuteRunnableKillOperator extends BaseTaskExecuteRunnabl
                     taskInstance.getName());
             return;
         }
-        final ILogicTaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+        final ILogicTaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                 .getProxyClient(taskInstance.getHost(), ILogicTaskInstanceOperator.class);
         final LogicTaskKillRequest logicTaskKillRequest = new LogicTaskKillRequest(taskInstance.getId());
         final LogicTaskKillResponse logicTaskKillResponse = taskInstanceOperator.killLogicTask(logicTaskKillRequest);

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/LogicTaskExecuteRunnablePauseOperator.java

@@ -40,7 +40,7 @@ public class LogicTaskExecuteRunnablePauseOperator extends BaseTaskExecuteRunnab
                     taskInstance.getName());
             return;
         }
-        final ILogicTaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+        final ILogicTaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                 .getProxyClient(taskInstance.getHost(), ILogicTaskInstanceOperator.class);
         final LogicTaskPauseRequest logicTaskPauseRequest = new LogicTaskPauseRequest(taskInstance.getId());
         final LogicTaskPauseResponse logicTaskPauseResponse =

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/LogicTaskExecuteRunnableTimeoutOperator.java

@@ -47,7 +47,7 @@ public class LogicTaskExecuteRunnableTimeoutOperator extends BaseTaskExecuteRunn
         }
 
         final ILogicTaskInstanceOperator iLogicTaskInstanceOperator =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskInstance.getHost(), ILogicTaskInstanceOperator.class);
 
         final LogicTaskKillRequest taskInstanceKillRequest = new LogicTaskKillRequest(taskInstance.getId());

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/TaskExecuteRunnableKillOperator.java

@@ -43,7 +43,7 @@ public class TaskExecuteRunnableKillOperator extends BaseTaskExecuteRunnableKill
             log.info("TaskInstance {} host is empty, no need to killRemoteTask", taskInstance.getName());
             return;
         }
-        ITaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+        ITaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                 .getProxyClient(taskInstance.getHost(), ITaskInstanceOperator.class);
         TaskInstanceKillRequest taskInstanceKillRequest = new TaskInstanceKillRequest(taskInstance.getId());
         TaskInstanceKillResponse taskInstanceKillResponse = taskInstanceOperator.killTask(taskInstanceKillRequest);

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/TaskExecuteRunnablePauseOperator.java

@@ -48,7 +48,7 @@ public class TaskExecuteRunnablePauseOperator implements TaskExecuteRunnableOper
             log.info("The TaskInstance: {} host is null, no need to pauseRemoteTaskInstance", taskInstance.getName());
             return;
         }
-        final ITaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+        final ITaskInstanceOperator taskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                 .getProxyClient(taskInstance.getHost(), ITaskInstanceOperator.class);
         final TaskInstancePauseRequest taskInstancePauseRequest = new TaskInstancePauseRequest(taskInstance.getId());
         final TaskInstancePauseResponse taskInstancePauseResponse =

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/TaskExecuteRunnableTimeoutOperator.java

@@ -45,7 +45,7 @@ public class TaskExecuteRunnableTimeoutOperator extends BaseTaskExecuteRunnableT
             return;
         }
 
-        final ITaskInstanceOperator iTaskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+        final ITaskInstanceOperator iTaskInstanceOperator = SingletonJdkDynamicRpcClientProxyFactory
                 .getProxyClient(taskInstance.getHost(), ITaskInstanceOperator.class);
 
         final TaskInstanceKillRequest taskInstanceKillRequest = new TaskInstanceKillRequest(taskInstance.getId());

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/dynamic/DynamicLogicTask.java

@@ -286,7 +286,7 @@ public class DynamicLogicTask extends BaseAsyncLogicTask<DynamicParameters> {
 
     private void sendToSubProcess(TaskExecutionContext taskExecutionContext, ProcessInstance subProcessInstance) {
         final ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(subProcessInstance.getHost(), ITaskInstanceExecutionEventListener.class);
         final WorkflowInstanceStateChangeEvent workflowInstanceStateChangeEvent = new WorkflowInstanceStateChangeEvent(
                 taskExecutionContext.getProcessInstanceId(),

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/subworkflow/SubWorkflowLogicTask.java

@@ -136,7 +136,7 @@ public class SubWorkflowLogicTask extends BaseAsyncLogicTask<SubProcessParameter
     private void sendToSubProcess(TaskExecutionContext taskExecutionContext,
                                   ProcessInstance subProcessInstance) {
         final ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(subProcessInstance.getHost(), ITaskInstanceExecutionEventListener.class);
         final WorkflowInstanceStateChangeEvent workflowInstanceStateChangeEvent = new WorkflowInstanceStateChangeEvent(
                 taskExecutionContext.getProcessInstanceId(),

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/WorkerFailoverService.java

@@ -274,7 +274,7 @@ public class WorkerFailoverService {
                     .create();
             // only kill yarn/k8s job if exists , the local thread has exited
             log.info("TaskInstance failover begin kill the task related yarn or k8s job");
-            IWorkerLogService iWorkerLogService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+            IWorkerLogService iWorkerLogService = SingletonJdkDynamicRpcClientProxyFactory
                     .getProxyClient(taskInstance.getHost(), IWorkerLogService.class);
             GetAppIdResponse getAppIdResponse =
                     iWorkerLogService.getAppId(new GetAppIdRequest(taskInstance.getId(), taskInstance.getLogPath()));

dolphinscheduler-microbench/pom.xml

@@ -48,6 +48,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.apache.dolphinscheduler</groupId>
+            <artifactId>dolphinscheduler-extract-base</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>

dolphinscheduler-microbench/src/main/java/org/apache/dolphinscheduler/microbench/rpc/IService.java

@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.microbench.rpc;
+
+import org.apache.dolphinscheduler.extract.base.RpcMethod;
+import org.apache.dolphinscheduler.extract.base.RpcService;
+
+@RpcService
+public interface IService {
+
+    @RpcMethod
+    String ping(String pingRequest);
+
+}

dolphinscheduler-microbench/src/main/java/org/apache/dolphinscheduler/microbench/rpc/IServiceImpl.java

@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.microbench.rpc;
+
+public class IServiceImpl implements IService {
+
+    @Override
+    public String ping(String pingRequest) {
+        return "I get " + pingRequest + ", I am Pong!";
+    }
+
+}

dolphinscheduler-microbench/src/main/java/org/apache/dolphinscheduler/microbench/rpc/RpcBenchMarkTest.java

@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.microbench.rpc;
+
+import org.apache.dolphinscheduler.extract.base.NettyRemotingServer;
+import org.apache.dolphinscheduler.extract.base.client.SingletonJdkDynamicRpcClientProxyFactory;
+import org.apache.dolphinscheduler.extract.base.config.NettyServerConfig;
+import org.apache.dolphinscheduler.extract.base.server.SpringServerMethodInvokerDiscovery;
+import org.apache.dolphinscheduler.microbench.base.AbstractBaseBenchmark;
+
+import java.util.concurrent.TimeUnit;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+@Slf4j
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 10, time = 1)
+@State(Scope.Benchmark)
+@BenchmarkMode({Mode.Throughput, Mode.AverageTime, Mode.SampleTime})
+public class RpcBenchMarkTest extends AbstractBaseBenchmark {
+
+    private NettyRemotingServer nettyRemotingServer;
+
+    private IService iService;
+
+    @Setup
+    public void before() {
+        nettyRemotingServer = new NettyRemotingServer(new NettyServerConfig(12345));
+        nettyRemotingServer.start();
+        SpringServerMethodInvokerDiscovery springServerMethodInvokerDiscovery =
+                new SpringServerMethodInvokerDiscovery(nettyRemotingServer);
+        springServerMethodInvokerDiscovery.postProcessAfterInitialization(new IServiceImpl(), "iServiceImpl");
+        iService =
+                SingletonJdkDynamicRpcClientProxyFactory.getProxyClient("localhost:12345", IService.class);
+    }
+
+    @Benchmark
+    @BenchmarkMode({Mode.Throughput, Mode.AverageTime, Mode.SampleTime})
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public void sendTest(Blackhole bh) {
+        String pong = iService.ping("ping");
+        bh.consume(pong);
+    }
+
+    @TearDown
+    public void after() {
+        nettyRemotingServer.close();
+    }
+}

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java

@@ -389,8 +389,8 @@ public class ProcessServiceImpl implements ProcessService {
                 if (update) {
                     try {
                         final ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                                SingletonJdkDynamicRpcClientProxyFactory.getProxyClient(info.getHost(),
-                                        .getProxyClient(info.getHost(), ITaskInstanceExecutionEventListener.class);
+                                        ITaskInstanceExecutionEventListener.class);
                         final WorkflowInstanceStateChangeEvent workflowInstanceStateChangeEvent =
                                 new WorkflowInstanceStateChangeEvent(info.getId(), 0, info.getState(), info.getId(), 0);
                         iTaskInstanceExecutionEventListener
@@ -516,11 +516,11 @@ public class ProcessServiceImpl implements ProcessService {
                 continue;
             }
             if (TaskUtils.isLogicTask(taskInstance.getTaskType())) {
-                IMasterLogService masterLogService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                IMasterLogService masterLogService = SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskInstance.getHost(), IMasterLogService.class);
                 masterLogService.removeLogicTaskInstanceLog(taskLogPath);
             } else {
-                IWorkerLogService iWorkerLogService = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                IWorkerLogService iWorkerLogService = SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskInstance.getHost(), IWorkerLogService.class);
                 iWorkerLogService.removeTaskInstanceLog(taskLogPath);
             }

dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/message/TaskInstanceExecutionFinishEventSender.java

@@ -33,7 +33,7 @@ public class TaskInstanceExecutionFinishEventSender
     @Override
     public void sendEvent(TaskInstanceExecutionFinishEvent taskInstanceExecutionFinishEvent) {
         ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskInstanceExecutionFinishEvent.getHost(),
                                 ITaskInstanceExecutionEventListener.class);
         iTaskInstanceExecutionEventListener.onTaskInstanceExecutionFinish(taskInstanceExecutionFinishEvent);

dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/message/TaskInstanceExecutionInfoUpdateEventSender.java

@@ -35,7 +35,7 @@ public class TaskInstanceExecutionInfoUpdateEventSender
     @Override
     public void sendEvent(TaskInstanceExecutionInfoEvent taskInstanceExecutionInfoEvent) {
         ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskInstanceExecutionInfoEvent.getHost(),
                                 ITaskInstanceExecutionEventListener.class);
         iTaskInstanceExecutionEventListener.onTaskInstanceExecutionInfoUpdate(taskInstanceExecutionInfoEvent);

dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/message/TaskInstanceExecutionRunningEventSender.java

@@ -35,7 +35,7 @@ public class TaskInstanceExecutionRunningEventSender
     @Override
     public void sendEvent(TaskInstanceExecutionRunningEvent taskInstanceExecutionRunningEvent) {
         ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
-                SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+                SingletonJdkDynamicRpcClientProxyFactory
                         .getProxyClient(taskInstanceExecutionRunningEvent.getHost(),
                                 ITaskInstanceExecutionEventListener.class);
         iTaskInstanceExecutionEventListener.onTaskInstanceExecutionRunning(taskInstanceExecutionRunningEvent);

dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerTaskExecuteRunnable.java

@@ -257,7 +257,7 @@ public abstract class WorkerTaskExecuteRunnable implements Runnable {
                 task.getExitStatus() == TaskExecutionStatus.SUCCESS ? WarningType.SUCCESS.getCode()
                         : WarningType.FAILURE.getCode());
         try {
-            IAlertOperator alertOperator = SingletonJdkDynamicRpcClientProxyFactory.getInstance()
+            IAlertOperator alertOperator = SingletonJdkDynamicRpcClientProxyFactory
                     .getProxyClient(alertServerAddress.getAddress(), IAlertOperator.class);
             AlertSendResponse alertSendResponse = alertOperator.sendAlert(alertSendRequest);
             log.info("Send alert to: {} successfully, response: {}", alertServerAddress, alertSendResponse);