feat(e2e): add noDuplicates verification to detect duplicate query results (#12253)

wu-sheng · claude · wu-sheng · commit 9c27cdac01b1 · 2026-04-14T08:35:27.000+08:00
Add `| noDuplicates` pipe function to all entity-level `contains` blocks in e2e expected YAML files, leveraging the new infra-e2e feature from apache/skywalking-infra-e2e#145. This ensures e2e tests will catch duplicate data in query results (services, instances, endpoints, traces, spans, dependencies, events, metrics, etc.), preventing regressions like the one reported in apache/skywalking#12219. Also bumps SW_INFRA_E2E_COMMIT, SW_OAP_COMMIT, and the GitHub Actions infra-e2e action to their latest versions. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -111,7 +111,7 @@ jobs:
         run: |
           bash test/e2e-v2/cases/lifecycle/data-generator/gen.sh
       - name: ${{ matrix.test.name }}
-        uses: apache/skywalking-infra-e2e@e26033e1faaf865899c486ffe17dabdf17b90aae
+        uses: apache/skywalking-infra-e2e@ef073adb8b9e148e4eaf3f905fa4e238ee5cc7d6
         with:
           e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
       - name: Fix directory permissions
diff --git a/CHANGES.md b/CHANGES.md
@@ -10,6 +10,7 @@ Release Notes.
 - Collect BanyanDB data on e2e test failure for CI debugging.
 - Add log query e2e test.
 - Sync lifecycle e2e test from SkyWalking stages test.
+- Add `noDuplicates` verification to all e2e expected files to detect duplicate data in query results.
 - Add periodic health check for property schema connection.
 - Persist segment end time in per-segment metadata so boundaries don't shift across restarts or config changes.
 - [Breaking Change] Remove etcd components. The property-based schema registry is now the only supported mode. 
diff --git a/test/e2e-v2/cases/event/expected/events.yml b/test/e2e-v2/cases/event/expected/events.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 events:
-  {{- contains .events }}
+  {{- contains (.events | noDuplicates) }}
   - uuid: abcde
     source:
       service: e2e-service
diff --git a/test/e2e-v2/cases/lifecycle/expected/dependency-endpoint.yml b/test/e2e-v2/cases/lifecycle/expected/dependency-endpoint.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 nodes:
-{{- contains .nodes }}
+{{- contains (.nodes | noDuplicates) }}
 - id: {{ b64enc "mock_a_service" }}.1_{{ b64enc "/dubbox-case/case/dubbox-rest/404-test" }}
   name: /dubbox-case/case/dubbox-rest/404-test
   serviceid: {{ b64enc "mock_a_service" }}.1
@@ -36,7 +36,7 @@ nodes:
   isreal: false
 {{- end }}
 calls:
-{{- contains .calls }}
+{{- contains (.calls | noDuplicates) }}
 - source: {{ b64enc "mock_a_service" }}.1_{{ b64enc "/dubbox-case/case/dubbox-rest/404-test" }}
   sourcecomponents: []
   target: {{ b64enc "mock_b_service" }}.1_{{ b64enc "org.skywaking.apm.testcase.dubbo.services.GreetServiceImpl.doBusiness()" }}
diff --git a/test/e2e-v2/cases/lifecycle/expected/dependency-instance.yml b/test/e2e-v2/cases/lifecycle/expected/dependency-instance.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 nodes:
-{{- contains .nodes }}
+{{- contains (.nodes | noDuplicates) }}
 - id: {{ b64enc "mock_a_service" }}.1_{{ b64enc "mock_a_service_instance" }}
   name: mock_a_service_instance
   serviceid: {{ b64enc "mock_a_service" }}.1
@@ -30,7 +30,7 @@ nodes:
   isreal: true
 {{- end }}
 calls:
-{{- contains .calls }}
+{{- contains (.calls | noDuplicates) }}
 - source: {{ b64enc "mock_a_service" }}.1_{{ b64enc "mock_a_service_instance" }}
   sourcecomponents: []
   target: {{ b64enc "mock_b_service" }}.1_{{ b64enc "mock_b_service_instance" }}
diff --git a/test/e2e-v2/cases/lifecycle/expected/dependency-services.yml b/test/e2e-v2/cases/lifecycle/expected/dependency-services.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 nodes:
-{{- contains .nodes }}
+{{- contains (.nodes | noDuplicates) }}
 - id: {{ b64enc "User"}}.0
   name: User
   type: USER
@@ -36,7 +36,7 @@ nodes:
     - GENERAL
 {{- end }}
 calls:
-{{- contains .calls }}
+{{- contains (.calls | noDuplicates) }}
 - source: {{ b64enc "mock_a_service"}}.1
   sourcecomponents:
     - Dubbo
diff --git a/test/e2e-v2/cases/lifecycle/expected/trace-detail.yml b/test/e2e-v2/cases/lifecycle/expected/trace-detail.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 spans:
-  {{- contains .spans }}
+  {{- contains (.spans | noDuplicates) }}
   - traceid: {{ .traceid }}
     segmentid: {{ .segmentid }}
     spanid: {{ .spanid }}
diff --git a/test/e2e-v2/cases/lifecycle/expected/traces-list.yml b/test/e2e-v2/cases/lifecycle/expected/traces-list.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 traces:
-{{- contains .traces }}
+{{- contains (.traces | noDuplicates) }}
 - segmentid: {{ notEmpty .segmentid }}
   endpointnames:
     - /dubbox-case/case/dubbox-rest/404-test
diff --git a/test/e2e-v2/cases/log/expected/logs.yml b/test/e2e-v2/cases/log/expected/logs.yml
@@ -16,7 +16,7 @@
 debuggingtrace: null
 errorreason: null
 logs:
-{{- contains .logs }}
+{{- contains (.logs | noDuplicates) }}
 - servicename: e2e-service-provider
   serviceid: {{ b64enc "e2e-service-provider" }}.1
   serviceinstancename: provider1
diff --git a/test/e2e-v2/cases/log/expected/metrics-has-value.yml b/test/e2e-v2/cases/log/expected/metrics-has-value.yml
@@ -16,7 +16,7 @@
 debuggingtrace: null
 type: TIME_SERIES_VALUES
 results:
-  {{- contains .results }}
+  {{- contains (.results | noDuplicates) }}
   - metric:
       labels: []
     values:
diff --git a/test/e2e-v2/cases/log/expected/service-endpoint.yml b/test/e2e-v2/cases/log/expected/service-endpoint.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains .}}
+{{- contains (. | noDuplicates) }}
 - id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "GET:/logs/trigger" }}
   name: GET:/logs/trigger
 {{- end}}
diff --git a/test/e2e-v2/cases/log/expected/service-instance.yml b/test/e2e-v2/cases/log/expected/service-instance.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{- contains .}}
+{{- contains (. | noDuplicates) }}
 - id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
   name: {{ notEmpty .name }}
   attributes:
diff --git a/test/e2e-v2/cases/log/expected/service.yml b/test/e2e-v2/cases/log/expected/service.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - id: {{ b64enc "e2e-service-provider" }}.1
   name: e2e-service-provider
   group: ""
diff --git a/test/e2e-v2/cases/profiling/trace/expected/profile-list-finished.yml b/test/e2e-v2/cases/profiling/trace/expected/profile-list-finished.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - id: {{ notEmpty .id }}
   serviceid: {{ b64enc "e2e-service-provider" }}.1
   servicename: ""
@@ -24,7 +24,7 @@
   dumpperiod: 500
   maxsamplingcount: 5
   logs:
-    {{- contains .logs }}
+    {{- contains (.logs | noDuplicates) }}
     - id: {{ notEmpty .id }}
       instanceid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
       operationtype: EXECUTION_FINISHED
diff --git a/test/e2e-v2/cases/profiling/trace/expected/profile-list-notified.yml b/test/e2e-v2/cases/profiling/trace/expected/profile-list-notified.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - id: {{ notEmpty .id }}
   serviceid: {{ b64enc "e2e-service-provider" }}.1
   servicename: ""
@@ -24,7 +24,7 @@
   dumpperiod: 500
   maxsamplingcount: 5
   logs:
-    {{- contains .logs }}
+    {{- contains (.logs | noDuplicates) }}
     - id: {{ notEmpty .id }}
       instanceid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
       operationtype: NOTIFIED
diff --git a/test/e2e-v2/cases/profiling/trace/expected/profile-segment-analyze.yml b/test/e2e-v2/cases/profiling/trace/expected/profile-segment-analyze.yml
@@ -15,9 +15,9 @@
 
 tip: null
 trees:
-  {{- contains .trees }}
+  {{- contains (.trees | noDuplicates) }}
   - elements:
-    {{- contains .elements }}
+    {{- contains (.elements | noDuplicates) }}
     - id: "{{ notEmpty .id }}"
       parentid: "{{ notEmpty .parentid }}"
       codesignature: "test.apache.skywalking.e2e.profile.ProfileController.createAuthor:-1"
diff --git a/test/e2e-v2/cases/profiling/trace/expected/profile-segment-list.yml b/test/e2e-v2/cases/profiling/trace/expected/profile-segment-list.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - traceid: {{ notEmpty .traceid }}
   instanceid: {{ notEmpty .instanceid }}
   instancename: provider1
@@ -22,7 +22,7 @@
   duration: {{ gt .duration 0 }}
   start: "{{ notEmpty .start }}"
   spans:
-  {{- contains .spans}}
+  {{- contains (.spans | noDuplicates) }}
   - spanid: {{ ge .spanid 0 }}
     parentspanid: {{ .parentspanid }}
     segmentid: {{ notEmpty .segmentid }}
diff --git a/test/e2e-v2/cases/profiling/trace/expected/service-endpoint.yml b/test/e2e-v2/cases/profiling/trace/expected/service-endpoint.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "POST:/profile/{name}" }}
   name: POST:/profile/{name}
 {{- end}}
diff --git a/test/e2e-v2/cases/profiling/trace/expected/service-instance.yml b/test/e2e-v2/cases/profiling/trace/expected/service-instance.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
   name: provider1
   attributes:
diff --git a/test/e2e-v2/cases/profiling/trace/expected/service.yml b/test/e2e-v2/cases/profiling/trace/expected/service.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - id: {{ b64enc "e2e-service-provider" }}.1
   name: e2e-service-provider
   group: ""
diff --git a/test/e2e-v2/cases/profiling/trace/expected/traces-v2-list.yml b/test/e2e-v2/cases/profiling/trace/expected/traces-v2-list.yml
@@ -20,9 +20,9 @@ retrievedtimerange:
   endtime: {{ gt .endtime 0 }}
   {{- end }}
 traces:
-  {{- contains .traces }}
+  {{- contains (.traces | noDuplicates) }}
   - spans:
-    {{- contains .spans }}
+    {{- contains (.spans | noDuplicates) }}
     - traceid: {{ .traceid }}
       segmentid: {{ .segmentid }}
       spanid: {{ .spanid }}
diff --git a/test/e2e-v2/cases/rover/process/istio/banyandb/expected/process.yml b/test/e2e-v2/cases/rover/process/istio/banyandb/expected/process.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - id: {{ notEmpty .id }}
   name: gunicorn
   serviceid: {{ b64enc "productpage.default" }}.1
diff --git a/test/e2e-v2/cases/rover/process/istio/banyandb/expected/service-instance.yml b/test/e2e-v2/cases/rover/process/istio/banyandb/expected/service-instance.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - id: {{ notEmpty .id }}
   name: {{ notEmpty .name }}
   attributes: []
diff --git a/test/e2e-v2/cases/rover/process/istio/banyandb/expected/service.yml b/test/e2e-v2/cases/rover/process/istio/banyandb/expected/service.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - id: {{ b64enc "details.default" }}.1
   name: details.default
   group: ""
diff --git a/test/e2e-v2/cases/storage/expected/dependency-endpoint-consumer.yml b/test/e2e-v2/cases/storage/expected/dependency-endpoint-consumer.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 nodes:
-{{- contains .nodes }}
+{{- contains (.nodes | noDuplicates) }}
 - id: {{ b64enc "User" }}.0_{{ b64enc "User" }}
   name: User
   serviceid: {{ b64enc "User" }}.0
@@ -36,7 +36,7 @@ nodes:
   isreal: true
 {{- end }}
 calls:
-{{- contains .calls }}
+{{- contains (.calls | noDuplicates) }}
 - source: {{ b64enc "User" }}.0_{{ b64enc "User" }}
   sourcecomponents: []
   target: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "POST:/users" }}
diff --git a/test/e2e-v2/cases/storage/expected/dependency-endpoint-provider.yml b/test/e2e-v2/cases/storage/expected/dependency-endpoint-provider.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 nodes:
-{{- contains .nodes }}
+{{- contains (.nodes | noDuplicates) }}
 - id: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "POST:/users" }}
   name: POST:/users
   serviceid: {{ b64enc "e2e-service-consumer" }}.1
@@ -30,7 +30,7 @@ nodes:
   isreal: true
 {{- end }}
 calls:
-{{- contains .calls }}
+{{- contains (.calls | noDuplicates) }}
 - source: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "POST:/users" }}
   sourcecomponents: []
   target: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "POST:/users" }}
diff --git a/test/e2e-v2/cases/storage/expected/dependency-instance.yml b/test/e2e-v2/cases/storage/expected/dependency-instance.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 nodes:
-{{- contains .nodes }}
+{{- contains (.nodes | noDuplicates) }}
 - id: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }}
   name: consumer1
   serviceid: {{ b64enc "e2e-service-consumer" }}.1
@@ -30,7 +30,7 @@ nodes:
   isreal: true
 {{- end }}
 calls:
-{{- contains .calls }}
+{{- contains (.calls | noDuplicates) }}
 - source: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }}
   sourcecomponents: []
   target: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
diff --git a/test/e2e-v2/cases/storage/expected/dependency-services-consumer.yml b/test/e2e-v2/cases/storage/expected/dependency-services-consumer.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 nodes:
-{{- contains .nodes }}
+{{- contains (.nodes | noDuplicates) }}
 - id: {{ b64enc "User"}}.0
   name: User
   type: USER
@@ -36,7 +36,7 @@ nodes:
     - GENERAL
 {{- end }}
 calls:
-{{- contains .calls }}
+{{- contains (.calls | noDuplicates) }}
 - source: {{ b64enc "e2e-service-consumer"}}.1
   sourcecomponents:
     - SpringRestTemplate
diff --git a/test/e2e-v2/cases/storage/expected/dependency-services-provider.yml b/test/e2e-v2/cases/storage/expected/dependency-services-provider.yml
@@ -15,7 +15,7 @@
 
 debuggingtrace: null
 nodes:
-{{- contains .nodes }}
+{{- contains (.nodes | noDuplicates) }}
 - id: {{ b64enc "e2e-service-provider"}}.1
   name: e2e-service-provider
   type: Tomcat
@@ -36,7 +36,7 @@ nodes:
     - VIRTUAL_DATABASE
 {{- end }}
 calls:
-{{- contains .calls }}
+{{- contains (.calls | noDuplicates) }}
 - source: {{ b64enc "e2e-service-consumer"}}.1
   sourcecomponents:
     - SpringRestTemplate
diff --git a/test/e2e-v2/cases/storage/expected/event-list.yml b/test/e2e-v2/cases/storage/expected/event-list.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 events:
-{{- contains .events }}
+{{- contains (.events | noDuplicates) }}
 - uuid: {{ notEmpty .uuid }}
   source:
     service: e2e-service-provider
diff --git a/test/e2e-v2/cases/storage/expected/layer.yml b/test/e2e-v2/cases/storage/expected/layer.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+{{- contains (. | noDuplicates) }}
 - GENERAL
 - VIRTUAL_DATABASE
 {{- end }}
diff --git a/test/e2e-v2/cases/storage/expected/metrics-has-value-percentile.yml b/test/e2e-v2/cases/storage/expected/metrics-has-value-percentile.yml
@@ -16,7 +16,7 @@
 debuggingtrace: null
 type: TIME_SERIES_VALUES
 results:
-  {{- contains .results }}
+  {{- contains (.results | noDuplicates) }}
   - metric:
       labels:
         {{- contains .metric.labels }}
diff --git a/test/e2e-v2/cases/storage/expected/metrics-has-value.yml b/test/e2e-v2/cases/storage/expected/metrics-has-value.yml
diff --git a/test/e2e-v2/cases/storage/expected/metrics-top-endpoint.yml b/test/e2e-v2/cases/storage/expected/metrics-top-endpoint.yml
diff --git a/test/e2e-v2/cases/storage/expected/metrics-top-service.yml b/test/e2e-v2/cases/storage/expected/metrics-top-service.yml
diff --git a/test/e2e-v2/cases/storage/expected/service-endpoint-consumer.yml b/test/e2e-v2/cases/storage/expected/service-endpoint-consumer.yml
diff --git a/test/e2e-v2/cases/storage/expected/service-endpoint-provider.yml b/test/e2e-v2/cases/storage/expected/service-endpoint-provider.yml
diff --git a/test/e2e-v2/cases/storage/expected/service-instance-consumer.yml b/test/e2e-v2/cases/storage/expected/service-instance-consumer.yml
diff --git a/test/e2e-v2/cases/storage/expected/service-instance-provider.yml b/test/e2e-v2/cases/storage/expected/service-instance-provider.yml
diff --git a/test/e2e-v2/cases/storage/expected/service.yml b/test/e2e-v2/cases/storage/expected/service.yml
diff --git a/test/e2e-v2/cases/storage/expected/traces-v2-list.yml b/test/e2e-v2/cases/storage/expected/traces-v2-list.yml
diff --git a/test/e2e-v2/cases/zipkin/expected/traces.yml b/test/e2e-v2/cases/zipkin/expected/traces.yml
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
diff --git a/test/e2e-v2/script/prepare/setup-e2e-shell/install-e2e.sh b/test/e2e-v2/script/prepare/setup-e2e-shell/install-e2e.sh
