From 4b89c8f366f6216077f240ce72d50fa223401638 Mon Sep 17 00:00:00 2001
From: v-kkhuang <420895376@qq.com>
Date: Mon, 9 Mar 2026 21:28:49 +0800
Subject: [PATCH] =?UTF-8?q?#AI=20commit#=20=E4=BC=98=E5=8C=96=EF=BC=9A?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BC=95=E6=93=8E=E5=88=9B=E5=BB=BA=E5=92=8C?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=97=B6=E6=8C=87=E6=A0=87=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/DefaultEngineCreateService.scala   | 35 +++++++++++------
 .../engine/DefaultEngineReuseService.scala    | 38 ++++++++++++-------
 2 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala
index 27a961b852..ac05d4e96b 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala
@@ -289,17 +289,30 @@ class DefaultEngineCreateService
         s"Failed to update engineNode: ${t.getMessage}"
       )
     }
-    if (Configuration.METRICS_INCREMENTAL_UPDATE_ENABLE.getValue) {
-      val emInstance = engineNode.getServiceInstance.getInstance
-      val ecmInstance = engineNode.getEMNode.getServiceInstance.getInstance
-      // 8. Update job history metrics after successful engine creation - 异步执行
-      AMUtils.updateMetricsAsync(
-        taskId,
-        resourceTicketId,
-        emInstance,
-        ecmInstance,
-        null,
-        isReuse = false
+    Utils.tryCatch {
+      if (Configuration.METRICS_INCREMENTAL_UPDATE_ENABLE.getValue) {
+        val emInstance = engineNode.getServiceInstance.getInstance
+        val ecmInstance = engineNode.getEMNode.getServiceInstance.getInstance
+        if ((null != emInstance) && (null != ecmInstance)) {
+          // 8. Update job history metrics after successful engine creation - 异步执行
+          AMUtils.updateMetricsAsync(
+            taskId,
+            resourceTicketId,
+            emInstance,
+            ecmInstance,
+            null,
+            isReuse = false
+          )
+        } else {
+          logger.info(
+            s"CreateEngine:Failed to update metrics for emInstance: $emInstance, ecmInstance: $ecmInstance"
+          )
+        }
+      }
+    } { case e: Exception =>
+      logger.error(
+        s"Failed to update metrics for taskId: $taskId",
+        e
       )
     }
     // 9. Add the Label of EngineConn, and add the Alias of engineConn
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.scala
index fb79c9e062..eca36c9b41 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.scala
@@ -383,19 +383,31 @@ class DefaultEngineReuseService extends AbstractEngineService with EngineReuseSe
           .toJson(engine) + " from engineLabelMap : " + AMUtils.GSON.toJson(instances)
       )
     }
-    if (Configuration.METRICS_INCREMENTAL_UPDATE_ENABLE.getValue) {
-      val engineNode =
-        ecResourceInfoService.getECResourceInfoRecordByInstance(
-          engine.getServiceInstance.getInstance
-        )
-      // 异步更新 metrics
-      AMUtils.updateMetricsAsync(
-        taskId,
-        engineNode.getTicketId,
-        engineNode.getServiceInstance,
-        engineNode.getEcmInstance,
-        engineNode.getLogDirSuffix,
-        isReuse = true
+    Utils.tryCatch {
+      if (Configuration.METRICS_INCREMENTAL_UPDATE_ENABLE.getValue) {
+        val engineNode =
+          ecResourceInfoService.getECResourceInfoRecordByInstance(
+            engine.getServiceInstance.getInstance
+          )
+        if (null != engineNode) {
+          // 异步更新 metrics
+          AMUtils.updateMetricsAsync(
+            taskId,
+            engineNode.getTicketId,
+            engineNode.getServiceInstance,
+            engineNode.getEcmInstance,
+            engineNode.getLogDirSuffix,
+            isReuse = true
+          )
+        } else {
+          logger.info(s"ReuseEngine:Failed to update metrics for engineNode: $engineNode")
+        }
+
+      }
+    } { case e: Exception =>
+      logger.error(
+        s"Failed to update metrics for taskId: $taskId",
+        e
       )
     }
     engine