From 0f79e35283cb63fb685bb8bb19eab8386e32f48a Mon Sep 17 00:00:00 2001
From: mrproliu <741550557@qq.com>
Date: Thu, 12 Sep 2024 12:41:01 +0800
Subject: [PATCH] Fix the previous analysis result missing in the ALS
 `k8s-mesh` analyzer (#12611)

---
 docs/en/changes/changes.md                                    | 1 +
 .../receiver/envoy/als/k8s/K8sALSServiceMeshHTTPAnalysis.java | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 8256d95791..f4307a7076 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -62,6 +62,7 @@
 * Add self-observability metrics for OpenTelemetry receiver.
 * Support service level metrics aggregate when missing pod context in eBPF Access Log Receiver.
 * Fix query `getGlobalTopology` throw exception when didn't find any services by the given Layer.
+* Fix the previous analysis result missing in the ALS `k8s-mesh` analyzer.
 
 #### UI
 
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8sALSServiceMeshHTTPAnalysis.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8sALSServiceMeshHTTPAnalysis.java
index 2c7e24c265..e4b0368f55 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8sALSServiceMeshHTTPAnalysis.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8sALSServiceMeshHTTPAnalysis.java
@@ -79,6 +79,10 @@ public class K8sALSServiceMeshHTTPAnalysis extends AbstractALSAnalyzer {
                     return result;
                 }
                 return analyzeSideCar(result, entry);
+            case NONE:
+                // For the Ambient Istio with waypoint mode, the role is NONE.
+                // The analysis should keep the result from other roles.
+                return result;
         }
 
         return Result.builder().build();