[skywalking] branch master updated: Revert mis-change, which makes the endpoint dependency breaking. (#7829)

[wu...@apache.org]

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 55de557  Revert mis-change, which makes the endpoint dependency breaking. (#7829)
55de557 is described below

commit 55de557acf82589c461c3fa9c6ecca3fac4b594b
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 29 09:06:29 2021 +0800

    Revert mis-change, which makes the endpoint dependency breaking. (#7829)
    
    * Revert mis-change, which makes the endpoint dependency breaking.
    
    * Update change log.
---
 CHANGES.md                                                              | 1 +
 .../server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d4a5782..0009ad0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Release Notes.
 * Fix wrong (de)serializer of ElasticSearch client for OpenSearch storage.
 * Fix that traces query with tags will report error.
 * Replace e2e simple cases to e2e-v2.
+* Fix endpoint dependency breaking.
 
 #### UI
 
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
index 9b8b319..10a5522 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
@@ -187,7 +187,7 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
             Query.term(
                 EndpointRelationServerSideMetrics.SOURCE_ENDPOINT, destEndpointId
             ));
-        serviceIdBoolQuery.must(
+        serviceIdBoolQuery.should(
             Query.term(
                 EndpointRelationServerSideMetrics.DEST_ENDPOINT, destEndpointId
             ));