BanyanDB: fix Zipkin query by annotationQuery (#13430)

Author: wankai123

docs/en/changes/changes.md

@@ -63,7 +63,7 @@
 * Bump up netty to 4.2.4.Final.
 * Bump up commons-lang to 3.18.0.
 * BanyanDB: support group `replicas` and `user/password` for basic authentication.
-* BanyanDB: fix Zipkin query missing tag `QUERY`.
+* BanyanDB: fix Zipkin query by `annotationQuery`
 
 #### UI
 

oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBZipkinQueryDAO.java

@@ -230,13 +230,15 @@ public void apply(final StreamQuery query) {
                 }
 
                 if (!CollectionUtils.isEmpty(request.annotationQuery())) {
+                    List<String> queryConditions = new ArrayList<>();
                     for (Map.Entry<String, String> annotation : request.annotationQuery().entrySet()) {
                         if (annotation.getValue().isEmpty()) {
-                            query.and(eq(ZipkinSpanRecord.QUERY, annotation.getKey()));
+                            queryConditions.add(annotation.getKey());
                         } else {
-                            query.and(eq(ZipkinSpanRecord.QUERY, annotation.getKey() + "=" + annotation.getValue()));
+                            queryConditions.add(annotation.getKey() + "=" + annotation.getValue());
                         }
                     }
+                    query.and(having(ZipkinSpanRecord.QUERY, queryConditions));
                 }
 
                 if (request.minDuration() != null) {

test/e2e-v2/cases/zipkin/zipkin-cases.yaml

@@ -18,16 +18,16 @@ cases:
   - query: curl http://${oap_host}:${oap_9412}/zipkin/api/v2/services
     expected: expected/service-name.yml
   # remote-service name
-  - query: curl http://${oap_host}:${oap_9412}/zipkin/api/v2/remoteServices?serviceName=frontend
+  - query: curl "http://${oap_host}:${oap_9412}/zipkin/api/v2/remoteServices?serviceName=frontend"
     expected: expected/remote-service-name.yml
   # span name
-  - query: curl http://${oap_host}:${oap_9412}/zipkin/api/v2/spans?serviceName=frontend
+  - query: curl "http://${oap_host}:${oap_9412}/zipkin/api/v2/spans?serviceName=frontend"
     expected: expected/span-name.yml
   # traces
-  - query: curl http://${oap_host}:${oap_9412}/zipkin/api/v2/traces?serviceName=frontend&remoteServiceName=backend&spanName=get&annotationQuery=wr&limit=1
+  - query: curl "http://${oap_host}:${oap_9412}/zipkin/api/v2/traces?serviceName=frontend&remoteServiceName=backend&spanName=get&annotationQuery=wr&limit=1"
     expected: expected/traces.yml
   # autocomplete
   - query: curl http://${oap_host}:${oap_9412}/zipkin/api/v2/autocompleteKeys
     expected: expected/autocomplete-keys.yml
-  - query: curl http://${oap_host}:${oap_9412}/zipkin/api/v2/autocompleteValues?key=http.method
+  - query: curl "http://${oap_host}:${oap_9412}/zipkin/api/v2/autocompleteValues?key=http.method"
     expected: expected/autocomplete-value.yml