(skywalking) branch master updated: Fix analysis tracing profiling error (#13372)

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new b1d69fdeb7 Fix analysis tracing profiling error (#13372)
b1d69fdeb7 is described below

commit b1d69fdeb7854b0800524073a1f764aa22b70660
Author: mrproliu <741550...@qq.com>
AuthorDate: Thu Jul 17 01:50:47 2025 +0800

    Fix analysis tracing profiling error (#13372)
---
 docs/en/changes/changes.md                                         | 2 ++
 .../elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java       | 7 ++++++-
 skywalking-ui                                                      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 375103ce33..127af4a5dd 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -41,6 +41,7 @@
 * Bump up grpc to 1.70.0.
 * BanyanDB: support new Index rule type `SKIPPING/TREE`, and update the record 
`log`'s `trace_id` indexType to `SKIPPING`
 * BanyanDB: remove `index-only` from tag setting.
+* Fix analysis tracing profiling span failure in ES storage.
 
 #### UI
 
@@ -52,6 +53,7 @@
 * Implement the Status API on Settings page.
 * Bump vite from 6.2.6 to 6.3.4.
 * Enhance async profiling by adding shorter and custom duration options.
+* Fix select wrong span to analysis in trace profiling.
 
 #### Documentation
 
diff --git 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java
 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java
index 5669ead679..24d714b7ed 100644
--- 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java
+++ 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java
@@ -152,6 +152,11 @@ public class ProfileThreadSnapshotQueryEsDAO extends EsDAO
             (Map<String, Object>) response.getAggregations()
                                           
.get(ProfileThreadSnapshotRecord.SEQUENCE);
 
-        return ((Number) agg.get("value")).intValue();
+        final Object val = agg.get("value");
+        // return not found if no snapshot found
+        if (val == null) {
+            return -1;
+        }
+        return ((Number) val).intValue();
     }
 }
diff --git a/skywalking-ui b/skywalking-ui
index c5e45ab97a..518f607db3 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit c5e45ab97a74341a8403d5e831efeb9ed57e7954
+Subproject commit 518f607db32894dcf45d9a4fa44acb0f59170692