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 bea29412c4 Fix E2E test metrics verify: make it failure if the metric
values all null. (#13598)
bea29412c4 is described below
commit bea29412c4b5fbb1539d0c96d4816a2be552a2dc
Author: Wan Kai <[email protected]>
AuthorDate: Thu Dec 4 21:21:02 2025 +0800
Fix E2E test metrics verify: make it failure if the metric values all null.
(#13598)
---
.github/workflows/skywalking.yaml | 10 ++--
docs/en/changes/changes.md | 1 +
test/e2e-v2/cases/activemq/activemq-cases.yaml | 2 +-
.../metrics-has-value-label-destinationname.yml | 4 +-
.../metrics-has-value-label-destinationtype.yml | 4 +-
.../metrics-has-value-label-serviceinstanceid.yml | 4 +-
.../cases/activemq/expected/metrics-has-value.yml | 2 +-
test/e2e-v2/cases/alarm/banyandb/e2e.yaml | 2 +-
test/e2e-v2/cases/alarm/es/e2e.yaml | 2 +-
test/e2e-v2/cases/alarm/es/es-sharding/e2e.yaml | 2 +-
.../metrics-has-connection-value-label.yml | 4 +-
.../expected/metrics-has-latency-value-label.yml | 30 ++++++------
.../expected/metrics-has-status-value-label.yml | 2 +-
.../aws/api-gateway/expected/metrics-has-value.yml | 2 +-
.../aws/dynamodb/expected/metrics-has-value.yml | 2 +-
.../cases/aws/eks/expected/metrics-has-value.yml | 2 +-
.../cases/aws/s3/expected/metrics-has-value.yml | 2 +-
test/e2e-v2/cases/banyandb/banyandb-cases.yaml | 22 ++++-----
.../cases/banyandb/expected/metrics-has-value.yml | 2 +-
.../cases/banyandb/otel-collector-config.yaml | 4 +-
test/e2e-v2/cases/browser/browser-cases.yaml | 9 ++--
.../expected/metrics-has-value-percentile.yml | 2 +-
.../cases/cilium/expected/metrics-has-value.yml | 2 +-
.../expected/metrics-has-value-label.yml | 4 +-
.../clickhouse/expected/metrics-has-value.yml | 2 +-
.../expected/metrics-has-value-label-breaker.yml | 4 +-
.../expected/metrics-has-value-label-color.yml | 4 +-
.../expected/metrics-has-value-label-gc.yml | 4 +-
.../expected/metrics-has-value-label-mount.yml | 4 +-
.../expected/metrics-has-value-label-node.yml | 10 ++--
.../expected/metrics-has-value-label-pool.yml | 4 +-
.../expected/metrics-has-value-label-primary.yml | 4 +-
.../expected/metrics-has-value-label.yml | 4 +-
.../elasticsearch/expected/metrics-has-value.yml | 2 +-
.../expected/metrics-has-value-job-task-label.yml | 2 +-
.../metrics-has-value-jobManager-node-label.yml | 2 +-
.../metrics-has-value-operator-name-label.yml | 2 +-
.../cases/flink/expected/metrics-has-value.yml | 2 +-
.../expected/metrics-has-value-percentile.yml | 4 +-
.../cases/gateway/expected/metrics-has-value.yml | 2 +-
.../metrics-has-value-label-created_by.yml | 4 +-
.../metrics-has-value-label-percentile.yml | 10 ++--
.../e2e-v2/cases/go/expected/metrics-has-value.yml | 2 +-
.../cases/istio/als/expected/metrics-has-value.yml | 2 +-
.../ambient-als/expected/metrics-has-value.yml | 6 +--
.../metrics/expected/metrics-has-value-label.yml | 2 +-
.../istio/metrics/expected/metrics-has-value.yml | 2 +-
.../expected/metrics-has-value-gc-label.yml | 4 +-
.../expected/metrics-has-value-instance-label.yml | 4 +-
.../expected/metrics-has-value-jvm-label.yml | 2 +-
.../expected/metrics-has-value-service-label.yml | 2 +-
.../expected/metrics-has-value-source-label.yml | 6 +--
.../expected/metrics-has-value.yml | 2 +-
.../kafka/meter/expected/metrics-has-value.yml | 2 +-
.../metrics-has-value-label-bandwidth-endpoint.yml | 4 +-
.../metrics-has-value-label-bandwidth-service.yml | 4 +-
.../expected/metrics-has-value-label-bandwidth.yml | 6 +--
.../metrics-has-value-label-percentile.yml | 4 +-
.../kong/expected/metrics-has-value-label-pid.yml | 4 +-
.../metrics-has-value-label-shared-dict.yml | 4 +-
.../expected/metrics-has-value-label-state.yml | 4 +-
.../expected/metrics-has-value-label-status.yml | 4 +-
.../cases/kong/expected/metrics-has-value.yml | 2 +-
.../kong/expected/metrics-single-value-label.yml | 2 +-
.../cases/kong/expected/metrics-single-value.yml | 2 +-
.../cases/log/expected/metrics-has-value.yml | 2 +-
.../cases/lua/expected/metrics-has-value.yml | 2 +-
.../cases/lua/expected/service-instance-nginx.yml | 12 -----
.../cases/mariadb/expected/metrics-has-value.yml | 2 +-
.../metrics-has-value-label-created_by.yml | 4 +-
.../cases/meter/expected/metrics-has-value.yml | 2 +-
.../expected/metrics-has-value-label-assert.yml | 4 +-
...as-value-label-database-service_instance_id.yml | 6 +--
.../expected/metrics-has-value-label-version.yml | 6 +--
.../mongodb/expected/metrics-has-value-label.yml | 4 +-
.../cases/mongodb/expected/metrics-has-value.yml | 2 +-
.../cases/mqe/expected/aggregateLabels-OP.yml | 2 +-
test/e2e-v2/cases/mqe/expected/labels-old.yml | 6 +--
test/e2e-v2/cases/mqe/expected/no-OP.yml | 2 +-
test/e2e-v2/cases/mqe/expected/relabels-OP.yml | 6 +--
test/e2e-v2/cases/mqe/expected/sort-value-OP.yml | 2 +-
test/e2e-v2/cases/mqe/expected/trend-OP.yml | 2 +-
test/e2e-v2/cases/mqe/expected/viewAsSeq-OP.yml | 2 +-
test/e2e-v2/cases/mqe/mqe-cases.yaml | 4 +-
.../cases/mysql/expected/metrics-has-value.yml | 2 +-
...s-has-value-label-level-service_instance_id.yml | 6 +--
.../expected/metrics-has-value-label-level.yml | 4 +-
...-value-label-percentile-service_instance_id.yml | 6 +--
.../metrics-has-value-label-percentile.yml | 4 +-
...metrics-has-value-label-service_instance_id.yml | 4 +-
...s-has-value-label-state-service_instance_id.yml | 6 +--
.../expected/metrics-has-value-label-state.yml | 4 +-
...-has-value-label-status-service_instance_id.yml | 6 +--
.../expected/metrics-has-value-label-status.yml | 4 +-
...cs-has-value-label-type-service_instance_id.yml | 6 +--
.../expected/metrics-has-value-label-type.yml | 4 +-
.../cases/nginx/expected/metrics-has-value.yml | 2 +-
.../cases/nodejs/expected/metrics-has-value.yml | 2 +-
test/e2e-v2/cases/php/e2e.yaml | 6 +--
.../cases/php/expected/metrics-has-value.yml | 2 +-
.../ebpf/access_log/expected/metrics-has-value.yml | 2 +-
.../ebpf/continuous/expected/metrics-has-value.yml | 2 +-
.../expected/metrics-has-client-value-label.yml | 4 +-
.../expected/metrics-has-http1-value-label.yml | 8 ++--
.../expected/metrics-has-server-value-label.yml | 4 +-
.../ebpf/network/expected/metrics-has-value.yml | 2 +-
.../metrics-has-value-instance-bookie-label.yml | 2 +-
.../metrics-has-value-instance-broker-label.yml | 2 +-
.../cases/pulsar/expected/metrics-has-value.yml | 2 +-
test/e2e-v2/cases/pulsar/pulsar-cases.yaml | 54 +++++++++++-----------
.../cases/python/expected/metrics-has-value.yml | 2 +-
.../cases/redis/expected/metrics-has-value.yml | 2 +-
.../cases/satellite/native-protocols/e2e.yaml | 2 +-
.../expected/metrics-has-value.yml | 2 +-
.../expected/metrics-no-value.yml} | 4 +-
.../expected/metrics-has-value-percentile.yml | 4 +-
.../cases/simple/expected/metrics-has-value.yml | 2 +-
.../expected/metrics-has-memory-value-label.yml | 4 +-
.../expected/metrics-has-value-label-trace.yml | 2 +-
.../so11y/expected/metrics-has-value-label.yml | 2 +-
.../cases/so11y/expected/metrics-has-value.yml | 2 +-
.../expected/metrics-has-value-percentile.yml | 4 +-
.../cases/storage/expected/metrics-has-value.yml | 2 +-
.../cases/ttl/expected/metrics-has-value.yml | 2 +-
.../metrics-has-average-value-label-zabbix.yml | 4 +-
.../expected/metrics-has-average-value-label.yml | 4 +-
.../metrics-has-mountpoint-value-label.yml | 4 +-
.../e2e-v2/cases/vm/expected/metrics-has-value.yml | 2 +-
.../vm/expected/metrics-has-vfs-value-label.yml | 2 +-
.../cases/win/expected/metrics-has-value.yml | 2 +-
130 files changed, 267 insertions(+), 277 deletions(-)
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index 51f384738a..9e30c71b77 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -780,7 +780,7 @@ jobs:
if: matrix.test.docker != null
run: docker build -t ${{ matrix.test.docker.name }} -f ${{
matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{
matrix.test.docker.base }}
- name: ${{ matrix.test.name }}
- uses:
apache/skywalking-infra-e2e@01b80d98a38154f4f80d9cdb128b9d81727f2b80
+ uses:
apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
with:
e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
- if: ${{ failure() }}
@@ -844,7 +844,7 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: ${{ matrix.test.name }}
- uses:
apache/skywalking-infra-e2e@01b80d98a38154f4f80d9cdb128b9d81727f2b80
+ uses:
apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
env:
ISTIO_VERSION: ${{ matrix.versions.istio }}
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
@@ -905,7 +905,7 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: ${{ matrix.test.name }}
- uses:
apache/skywalking-infra-e2e@01b80d98a38154f4f80d9cdb128b9d81727f2b80
+ uses:
apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
env:
ISTIO_VERSION: ${{ matrix.versions.istio }}
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
@@ -968,7 +968,7 @@ jobs:
shell: bash
run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean
package
- name: Java version ${{ matrix.java-version }}
- uses:
apache/skywalking-infra-e2e@01b80d98a38154f4f80d9cdb128b9d81727f2b80
+ uses:
apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
env:
SW_AGENT_JDK_VERSION: ${{ matrix.java-version }}
with:
@@ -1064,7 +1064,7 @@ jobs:
# fi
# docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml
down -v
# - name: ${{ matrix.test.name }}
-# uses:
apache/skywalking-infra-e2e@01b80d98a38154f4f80d9cdb128b9d81727f2b80
+# uses:
apache/skywalking-infra-e2e@e7138da4f9b7a25a169c9f8d995795d4d2e34bde
# with:
# e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
# - if: ${{ failure() }}
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index b2ef569462..a209491394 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -1,6 +1,7 @@
## 10.4.0
#### Project
+* Fix E2E test metrics verify: make it failure if the metric values all null.
#### OAP Server
diff --git a/test/e2e-v2/cases/activemq/activemq-cases.yaml
b/test/e2e-v2/cases/activemq/activemq-cases.yaml
index 433b7bac56..4de059a788 100644
--- a/test/e2e-v2/cases/activemq/activemq-cases.yaml
+++ b/test/e2e-v2/cases/activemq/activemq-cases.yaml
@@ -105,7 +105,7 @@ cases:
expected: expected/metrics-has-value-label-destinationtype.yml
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_activemq_destination_consumer_count
--service-name=activemq::activemq-cluster --endpoint-name=testQueue
expected: expected/metrics-has-value-label-destinationtype.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_activemq_destination_topic_consumer_count
--service-name=activemq::activemq-cluster --endpoint-name=testQueue
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_activemq_destination_topic_consumer_count
--service-name=activemq::activemq-cluster --endpoint-name=testTopic
expected: expected/metrics-has-value.yml
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_activemq_destination_queue_size
--service-name=activemq::activemq-cluster --endpoint-name=testQueue
expected: expected/metrics-has-value-label-destinationtype.yml
diff --git
a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationname.yml
b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationname.yml
index 96c3ed0f69..6eb28b8935 100644
---
a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationname.yml
+++
b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationname.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: destinationName
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationtype.yml
b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationtype.yml
index 6415b764be..56ab66c04b 100644
---
a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationtype.yml
+++
b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationtype.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: destinationType
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-serviceinstanceid.yml
b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-serviceinstanceid.yml
index 768b67c420..6c73461fa2 100644
---
a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-serviceinstanceid.yml
+++
b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-serviceinstanceid.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: service_instance_id
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/activemq/expected/metrics-has-value.yml
b/test/e2e-v2/cases/activemq/expected/metrics-has-value.yml
index 7b16760571..f68a07155e 100644
--- a/test/e2e-v2/cases/activemq/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/activemq/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/alarm/banyandb/e2e.yaml
b/test/e2e-v2/cases/alarm/banyandb/e2e.yaml
index 2dab123bc3..338976fb3f 100644
--- a/test/e2e-v2/cases/alarm/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/banyandb/e2e.yaml
@@ -40,7 +40,7 @@ trigger:
verify:
retry:
- count: 20
+ count: 30
interval: 3s
cases:
- includes:
diff --git a/test/e2e-v2/cases/alarm/es/e2e.yaml
b/test/e2e-v2/cases/alarm/es/e2e.yaml
index 2dab123bc3..338976fb3f 100644
--- a/test/e2e-v2/cases/alarm/es/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/es/e2e.yaml
@@ -40,7 +40,7 @@ trigger:
verify:
retry:
- count: 20
+ count: 30
interval: 3s
cases:
- includes:
diff --git a/test/e2e-v2/cases/alarm/es/es-sharding/e2e.yaml
b/test/e2e-v2/cases/alarm/es/es-sharding/e2e.yaml
index 0ab7c649dd..c0d3593145 100644
--- a/test/e2e-v2/cases/alarm/es/es-sharding/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/es/es-sharding/e2e.yaml
@@ -40,7 +40,7 @@ trigger:
verify:
retry:
- count: 20
+ count: 30
interval: 3s
cases:
- includes:
diff --git
a/test/e2e-v2/cases/apisix/expected/metrics-has-connection-value-label.yml
b/test/e2e-v2/cases/apisix/expected/metrics-has-connection-value-label.yml
index 8352c10e51..50e29411b7 100644
--- a/test/e2e-v2/cases/apisix/expected/metrics-has-connection-value-label.yml
+++ b/test/e2e-v2/cases/apisix/expected/metrics-has-connection-value-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/apisix/expected/metrics-has-latency-value-label.yml
b/test/e2e-v2/cases/apisix/expected/metrics-has-latency-value-label.yml
index 9009b971e9..0f1eae4550 100644
--- a/test/e2e-v2/cases/apisix/expected/metrics-has-latency-value-label.yml
+++ b/test/e2e-v2/cases/apisix/expected/metrics-has-latency-value-label.yml
@@ -26,7 +26,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -43,7 +43,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -60,7 +60,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -77,7 +77,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -94,7 +94,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -111,7 +111,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -128,7 +128,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -145,7 +145,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -162,7 +162,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -179,7 +179,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -196,7 +196,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -213,7 +213,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -230,7 +230,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -247,7 +247,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -264,7 +264,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/apisix/expected/metrics-has-status-value-label.yml
b/test/e2e-v2/cases/apisix/expected/metrics-has-status-value-label.yml
index f30c6dfaf3..54af4a6466 100644
--- a/test/e2e-v2/cases/apisix/expected/metrics-has-status-value-label.yml
+++ b/test/e2e-v2/cases/apisix/expected/metrics-has-status-value-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/aws/api-gateway/expected/metrics-has-value.yml
b/test/e2e-v2/cases/aws/api-gateway/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/aws/api-gateway/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/aws/api-gateway/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/aws/dynamodb/expected/metrics-has-value.yml
b/test/e2e-v2/cases/aws/dynamodb/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/aws/dynamodb/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/aws/dynamodb/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/aws/eks/expected/metrics-has-value.yml
b/test/e2e-v2/cases/aws/eks/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/aws/eks/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/aws/eks/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/aws/s3/expected/metrics-has-value.yml
b/test/e2e-v2/cases/aws/s3/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/aws/s3/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/aws/s3/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/banyandb/banyandb-cases.yaml
b/test/e2e-v2/cases/banyandb/banyandb-cases.yaml
index 11bc0042fb..dfc901f490 100644
--- a/test/e2e-v2/cases/banyandb/banyandb-cases.yaml
+++ b/test/e2e-v2/cases/banyandb/banyandb-cases.yaml
@@ -17,26 +17,26 @@
# oap-server/server-starter/src/main/resources/otel-rules/banyandb.yaml
cases:
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_total_memory
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_total_memory --service-name=banyandb::server
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_write_rate
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_write_rate --service-name=banyandb::server
--instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_total_memory
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_total_memory
--service-name=banyandb::server --instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_total_cpu
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_total_cpu --service-name=banyandb::server
--instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_etcd_operation_rate
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_etcd_operation_rate
--service-name=banyandb::server --instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_active_instance
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_active_instance
--service-name=banyandb::server --instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_cpu_usage
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_cpu_usage --service-name=banyandb::server
--instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_rss_memory_usage
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_rss_memory_usage
--service-name=banyandb::server --instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_disk_usage_all
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_disk_usage_all
--service-name=banyandb::server --instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_network_usage_recv
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_network_usage_recv
--service-name=banyandb::server --instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_network_usage_sent
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_banyandb_instance_network_usage_sent
--service-name=banyandb::server --instance-name=banyandb:2121
expected: expected/metrics-has-value.yml
diff --git a/test/e2e-v2/cases/banyandb/expected/metrics-has-value.yml
b/test/e2e-v2/cases/banyandb/expected/metrics-has-value.yml
index e071b36c22..cf3ab682bb 100644
--- a/test/e2e-v2/cases/banyandb/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/banyandb/expected/metrics-has-value.yml
@@ -23,7 +23,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/banyandb/otel-collector-config.yaml
b/test/e2e-v2/cases/banyandb/otel-collector-config.yaml
index 356c5d0920..30d45627d2 100644
--- a/test/e2e-v2/cases/banyandb/otel-collector-config.yaml
+++ b/test/e2e-v2/cases/banyandb/otel-collector-config.yaml
@@ -22,14 +22,14 @@ receivers:
static_configs:
- targets: ["banyandb:2121"]
labels:
- host_name: root[root]
+ host_name: server
processors:
batch:
exporters:
otlp:
- endpoint: "oap:11800"
+ endpoint: oap:11800
tls:
insecure: true
debug:
diff --git a/test/e2e-v2/cases/browser/browser-cases.yaml
b/test/e2e-v2/cases/browser/browser-cases.yaml
index 6a6291917d..3087ae4371 100644
--- a/test/e2e-v2/cases/browser/browser-cases.yaml
+++ b/test/e2e-v2/cases/browser/browser-cases.yaml
@@ -70,10 +70,11 @@ cases:
query: |
swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--expression=browser_app_page_load_page_avg --service-id
dGVzdC11aQ==.1 --endpoint-name index.html
- - expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
- --expression=browser_app_web_vitals_cls_avg --service-id
dGVzdC11aQ==.1 --endpoint-name index.html
+# This mock env does not have CLS data
+# - expected: expected/metrics-has-value.yml
+# query: |
+# swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
+# --expression=browser_app_web_vitals_cls_avg --service-id
dGVzdC11aQ==.1 --endpoint-name index.html
- expected: expected/metrics-has-value.yml
query: |
swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
diff --git
a/test/e2e-v2/cases/browser/expected/metrics-has-value-percentile.yml
b/test/e2e-v2/cases/browser/expected/metrics-has-value-percentile.yml
index 469e8ed4a9..2ca902c8b0 100644
--- a/test/e2e-v2/cases/browser/expected/metrics-has-value-percentile.yml
+++ b/test/e2e-v2/cases/browser/expected/metrics-has-value-percentile.yml
@@ -21,7 +21,7 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
diff --git a/test/e2e-v2/cases/cilium/expected/metrics-has-value.yml
b/test/e2e-v2/cases/cilium/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/cilium/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/cilium/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/clickhouse/expected/metrics-has-value-label.yml
b/test/e2e-v2/cases/clickhouse/expected/metrics-has-value-label.yml
index 768b67c420..6c73461fa2 100644
--- a/test/e2e-v2/cases/clickhouse/expected/metrics-has-value-label.yml
+++ b/test/e2e-v2/cases/clickhouse/expected/metrics-has-value-label.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: service_instance_id
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/clickhouse/expected/metrics-has-value.yml
b/test/e2e-v2/cases/clickhouse/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/clickhouse/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/clickhouse/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-breaker.yml
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-breaker.yml
index d39f610612..adfad5b30f 100644
---
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-breaker.yml
+++
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-breaker.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: breaker
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-color.yml
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-color.yml
index 499557764b..a6cefb833f 100644
--- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-color.yml
+++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-color.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: color
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-gc.yml
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-gc.yml
index a81b5399f4..e1f0e88de9 100644
--- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-gc.yml
+++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-gc.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: gc
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-mount.yml
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-mount.yml
index bcdcfec7f6..b70133e005 100644
--- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-mount.yml
+++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-mount.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: mount
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-node.yml
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-node.yml
index c3eedfdc2b..733a7d8ba9 100644
--- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-node.yml
+++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-node.yml
@@ -21,18 +21,18 @@ results:
labels:
{{- contains .metric.labels }}
- key: es_master_node
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: es_ingest_node
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: es_client_node
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: es_data_node
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-pool.yml
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-pool.yml
index 5f4ec4baef..ad58eb4476 100644
--- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-pool.yml
+++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-pool.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: pool
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-primary.yml
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-primary.yml
index 7ffbc5c2bc..622c2c27d8 100644
---
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-primary.yml
+++
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-primary.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: primary
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label.yml
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label.yml
index d6f619e29a..0c8fbf8aad 100644
--- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label.yml
+++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: _
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value.yml
b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/flink/expected/metrics-has-value-job-task-label.yml
b/test/e2e-v2/cases/flink/expected/metrics-has-value-job-task-label.yml
index fc9bdda9e3..fbffa182cf 100644
--- a/test/e2e-v2/cases/flink/expected/metrics-has-value-job-task-label.yml
+++ b/test/e2e-v2/cases/flink/expected/metrics-has-value-job-task-label.yml
@@ -26,7 +26,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/flink/expected/metrics-has-value-jobManager-node-label.yml
b/test/e2e-v2/cases/flink/expected/metrics-has-value-jobManager-node-label.yml
index aef844ec54..fd466defcc 100644
---
a/test/e2e-v2/cases/flink/expected/metrics-has-value-jobManager-node-label.yml
+++
b/test/e2e-v2/cases/flink/expected/metrics-has-value-jobManager-node-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/flink/expected/metrics-has-value-operator-name-label.yml
b/test/e2e-v2/cases/flink/expected/metrics-has-value-operator-name-label.yml
index e563f93883..b4897d2819 100644
--- a/test/e2e-v2/cases/flink/expected/metrics-has-value-operator-name-label.yml
+++ b/test/e2e-v2/cases/flink/expected/metrics-has-value-operator-name-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/flink/expected/metrics-has-value.yml
b/test/e2e-v2/cases/flink/expected/metrics-has-value.yml
index 7b16760571..f68a07155e 100644
--- a/test/e2e-v2/cases/flink/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/flink/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/gateway/expected/metrics-has-value-percentile.yml
b/test/e2e-v2/cases/gateway/expected/metrics-has-value-percentile.yml
index cfce15019f..2ca902c8b0 100644
--- a/test/e2e-v2/cases/gateway/expected/metrics-has-value-percentile.yml
+++ b/test/e2e-v2/cases/gateway/expected/metrics-has-value-percentile.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/gateway/expected/metrics-has-value.yml
b/test/e2e-v2/cases/gateway/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/gateway/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/gateway/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/go/expected/metrics-has-value-label-created_by.yml
b/test/e2e-v2/cases/go/expected/metrics-has-value-label-created_by.yml
index 95fa994515..6d2bbbda93 100644
--- a/test/e2e-v2/cases/go/expected/metrics-has-value-label-created_by.yml
+++ b/test/e2e-v2/cases/go/expected/metrics-has-value-label-created_by.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: created_by
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/go/expected/metrics-has-value-label-percentile.yml
b/test/e2e-v2/cases/go/expected/metrics-has-value-label-percentile.yml
index 076964121e..ff0508c429 100644
--- a/test/e2e-v2/cases/go/expected/metrics-has-value-label-percentile.yml
+++ b/test/e2e-v2/cases/go/expected/metrics-has-value-label-percentile.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -54,7 +54,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -69,7 +69,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -84,7 +84,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/go/expected/metrics-has-value.yml
b/test/e2e-v2/cases/go/expected/metrics-has-value.yml
index 7503b1b726..ee439c023f 100644
--- a/test/e2e-v2/cases/go/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/go/expected/metrics-has-value.yml
@@ -23,7 +23,7 @@ results:
{{- contains .values }}
- id: {{ notEmpty .id }}
owner: null
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
- id: {{ notEmpty .id }}
owner: null
diff --git a/test/e2e-v2/cases/istio/als/expected/metrics-has-value.yml
b/test/e2e-v2/cases/istio/als/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/istio/als/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/istio/als/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/istio/ambient-als/expected/metrics-has-value.yml
b/test/e2e-v2/cases/istio/ambient-als/expected/metrics-has-value.yml
index d5e6476d7a..cae6688aec 100644
--- a/test/e2e-v2/cases/istio/ambient-als/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/istio/ambient-als/expected/metrics-has-value.yml
@@ -21,11 +21,11 @@ results:
labels: []
values:
{{- contains .values }}
- - id: "{{ notEmpty .id }}"
- value: {{ .value }}
+ - id: {{ notEmpty .id }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- - id: "{{ notEmpty .id }}"
+ - id: {{ notEmpty .id }}
value: null
owner: null
traceid: null
diff --git
a/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value-label.yml
b/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value-label.yml
index 10c8d321f7..19e88f76b2 100644
--- a/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value-label.yml
+++ b/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value.yml
b/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-gc-label.yml
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-gc-label.yml
index 8348dbd570..b79b896b58 100644
---
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-gc-label.yml
+++
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-gc-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-instance-label.yml
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-instance-label.yml
index fa68feece5..b415911e96 100644
---
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-instance-label.yml
+++
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-instance-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-jvm-label.yml
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-jvm-label.yml
index 1ec6e451a3..84cb498d43 100644
---
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-jvm-label.yml
+++
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-jvm-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-service-label.yml
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-service-label.yml
index 85612cde3e..e9d57ba14d 100644
---
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-service-label.yml
+++
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-service-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-source-label.yml
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-source-label.yml
index 8170f56052..adc26cf5f4 100644
---
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-source-label.yml
+++
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-source-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -54,7 +54,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value.yml
b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value.yml
index 7b16760571..f68a07155e 100644
--- a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/kafka/meter/expected/metrics-has-value.yml
b/test/e2e-v2/cases/kafka/meter/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/kafka/meter/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/kafka/meter/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-endpoint.yml
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-endpoint.yml
index 9589bcaf44..8e3bd7e70b 100644
---
a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-endpoint.yml
+++
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-endpoint.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: direction
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-service.yml
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-service.yml
index 9589bcaf44..8e3bd7e70b 100644
---
a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-service.yml
+++
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-service.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: direction
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth.yml
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth.yml
index 8fe24b36d7..d79476b4b3 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth.yml
+++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth.yml
@@ -21,14 +21,14 @@ results:
labels:
{{- contains .metric.labels }}
- key: direction
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: route
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-percentile.yml
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-percentile.yml
index f3f3bfaee2..3350c4b424 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-percentile.yml
+++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-percentile.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-pid.yml
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-pid.yml
index d4de39c5b5..7787620780 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-pid.yml
+++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-pid.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: pid
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-shared-dict.yml
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-shared-dict.yml
index 8010bf033c..d9af3defec 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-shared-dict.yml
+++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-shared-dict.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: shared_dict
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-state.yml
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-state.yml
index c0e8df5e47..e2b2e49c6d 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-state.yml
+++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-state.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: state
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-status.yml
b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-status.yml
index 46d65cfaae..76d3997e9d 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-status.yml
+++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-status.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: code
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value.yml
b/test/e2e-v2/cases/kong/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/kong/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/kong/expected/metrics-single-value-label.yml
b/test/e2e-v2/cases/kong/expected/metrics-single-value-label.yml
index 77e1775736..a86945f6f2 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-single-value-label.yml
+++ b/test/e2e-v2/cases/kong/expected/metrics-single-value-label.yml
@@ -26,7 +26,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
{{- end}}
diff --git a/test/e2e-v2/cases/kong/expected/metrics-single-value.yml
b/test/e2e-v2/cases/kong/expected/metrics-single-value.yml
index c29e995991..a9da69a890 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-single-value.yml
+++ b/test/e2e-v2/cases/kong/expected/metrics-single-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
{{- end}}
diff --git a/test/e2e-v2/cases/log/expected/metrics-has-value.yml
b/test/e2e-v2/cases/log/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/log/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/log/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/lua/expected/metrics-has-value.yml
b/test/e2e-v2/cases/lua/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/lua/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/lua/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/lua/expected/service-instance-nginx.yml
b/test/e2e-v2/cases/lua/expected/service-instance-nginx.yml
index 282774c4c2..fc3be88ed8 100644
--- a/test/e2e-v2/cases/lua/expected/service-instance-nginx.yml
+++ b/test/e2e-v2/cases/lua/expected/service-instance-nginx.yml
@@ -20,18 +20,6 @@
name: User_Service_Instance_Name
attributes:
{{- contains .attributes }}
- - name: OS Name
- value: Linux
- - name: hostname
- value: {{ notEmpty .value }}
- - name: Process No.
- value: "1"
- - name: Start Time
- value: {{ notEmpty .value }}
- - name: JVM Arguments
- value: '{{ notEmpty .value }}'
- - name: Jar Dependencies
- value: '{{ notEmpty .value }}'
- name: ipv4s
value: ""
{{- end}}
diff --git a/test/e2e-v2/cases/mariadb/expected/metrics-has-value.yml
b/test/e2e-v2/cases/mariadb/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/mariadb/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/mariadb/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/meter/expected/metrics-has-value-label-created_by.yml
b/test/e2e-v2/cases/meter/expected/metrics-has-value-label-created_by.yml
index 95fa994515..6d2bbbda93 100644
--- a/test/e2e-v2/cases/meter/expected/metrics-has-value-label-created_by.yml
+++ b/test/e2e-v2/cases/meter/expected/metrics-has-value-label-created_by.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: created_by
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/meter/expected/metrics-has-value.yml
b/test/e2e-v2/cases/meter/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/meter/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/meter/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-assert.yml
b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-assert.yml
index 209715e627..4e197463c4 100644
--- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-assert.yml
+++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-assert.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: assert_type
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-database-service_instance_id.yml
b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-database-service_instance_id.yml
index 5d46ccb7c6..b4f8deed3d 100644
---
a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-database-service_instance_id.yml
+++
b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-database-service_instance_id.yml
@@ -21,14 +21,14 @@ results:
labels:
{{- contains .metric.labels }}
- key: database
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: service_instance_id
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-version.yml
b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-version.yml
index 684e75114a..4bc39a2ba4 100644
--- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-version.yml
+++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-version.yml
@@ -21,14 +21,14 @@ results:
labels:
{{- contains .metric.labels }}
- key: edition
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: mongodb
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label.yml
b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label.yml
index 742de20687..d8e481dbcc 100644
--- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label.yml
+++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: rs_nm
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value.yml
b/test/e2e-v2/cases/mongodb/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/mqe/expected/aggregateLabels-OP.yml
b/test/e2e-v2/cases/mqe/expected/aggregateLabels-OP.yml
index 7b16760571..f68a07155e 100644
--- a/test/e2e-v2/cases/mqe/expected/aggregateLabels-OP.yml
+++ b/test/e2e-v2/cases/mqe/expected/aggregateLabels-OP.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/mqe/expected/labels-old.yml
b/test/e2e-v2/cases/mqe/expected/labels-old.yml
index 90f730e754..2bfc67a2ff 100644
--- a/test/e2e-v2/cases/mqe/expected/labels-old.yml
+++ b/test/e2e-v2/cases/mqe/expected/labels-old.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -54,7 +54,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/mqe/expected/no-OP.yml
b/test/e2e-v2/cases/mqe/expected/no-OP.yml
index 97fcfe03b9..e254a4a8b2 100644
--- a/test/e2e-v2/cases/mqe/expected/no-OP.yml
+++ b/test/e2e-v2/cases/mqe/expected/no-OP.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/mqe/expected/relabels-OP.yml
b/test/e2e-v2/cases/mqe/expected/relabels-OP.yml
index c21e86a280..8d8ce4afe9 100644
--- a/test/e2e-v2/cases/mqe/expected/relabels-OP.yml
+++ b/test/e2e-v2/cases/mqe/expected/relabels-OP.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
@@ -54,7 +54,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/mqe/expected/sort-value-OP.yml
b/test/e2e-v2/cases/mqe/expected/sort-value-OP.yml
index 12ae6bdf56..e75be7b59b 100644
--- a/test/e2e-v2/cases/mqe/expected/sort-value-OP.yml
+++ b/test/e2e-v2/cases/mqe/expected/sort-value-OP.yml
@@ -21,7 +21,7 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
diff --git a/test/e2e-v2/cases/mqe/expected/trend-OP.yml
b/test/e2e-v2/cases/mqe/expected/trend-OP.yml
index 97fcfe03b9..e254a4a8b2 100644
--- a/test/e2e-v2/cases/mqe/expected/trend-OP.yml
+++ b/test/e2e-v2/cases/mqe/expected/trend-OP.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/mqe/expected/viewAsSeq-OP.yml
b/test/e2e-v2/cases/mqe/expected/viewAsSeq-OP.yml
index 97fcfe03b9..e254a4a8b2 100644
--- a/test/e2e-v2/cases/mqe/expected/viewAsSeq-OP.yml
+++ b/test/e2e-v2/cases/mqe/expected/viewAsSeq-OP.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/mqe/mqe-cases.yaml
b/test/e2e-v2/cases/mqe/mqe-cases.yaml
index 6a63cc5de3..07abed90e8 100644
--- a/test/e2e-v2/cases/mqe/mqe-cases.yaml
+++ b/test/e2e-v2/cases/mqe/mqe-cases.yaml
@@ -93,9 +93,9 @@ cases:
expected: expected/isPresent-OP-false.yml
# trend-OP
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression="increase(service_resp_time,2)" --service-name=e2e-service-provider
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression="increase(service_resp_time,1)" --service-name=e2e-service-provider
expected: expected/trend-OP.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression="rate(service_resp_time,2)" --service-name=e2e-service-provider
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression="rate(service_resp_time,1)" --service-name=e2e-service-provider
expected: expected/trend-OP.yml
# sort-OP e2e used for test MQE expression, more tests can refer to the UT
diff --git a/test/e2e-v2/cases/mysql/expected/metrics-has-value.yml
b/test/e2e-v2/cases/mysql/expected/metrics-has-value.yml
index 8cd3239bcd..e9f5000aa2 100644
--- a/test/e2e-v2/cases/mysql/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/mysql/expected/metrics-has-value.yml
@@ -37,7 +37,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level-service_instance_id.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level-service_instance_id.yml
index 1c3c2081bf..2b1b1c6dcb 100644
---
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level-service_instance_id.yml
+++
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level-service_instance_id.yml
@@ -21,14 +21,14 @@ results:
labels:
{{- contains .metric.labels }}
- key: level
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: service_instance_id
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level.yml
index d96a5e1e7e..22271f2ac4 100644
--- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level.yml
+++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: level
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile-service_instance_id.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile-service_instance_id.yml
index 65fcbfa946..8df808da73 100644
---
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile-service_instance_id.yml
+++
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile-service_instance_id.yml
@@ -21,14 +21,14 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: service_instance_id
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile.yml
index f3f3bfaee2..3350c4b424 100644
--- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile.yml
+++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-service_instance_id.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-service_instance_id.yml
index 768b67c420..6c73461fa2 100644
---
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-service_instance_id.yml
+++
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-service_instance_id.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: service_instance_id
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state-service_instance_id.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state-service_instance_id.yml
index b65f05f40d..801b692baf 100644
---
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state-service_instance_id.yml
+++
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state-service_instance_id.yml
@@ -21,14 +21,14 @@ results:
labels:
{{- contains .metric.labels }}
- key: state
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: service_instance_id
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state.yml
index 1e881f87e4..9574fc742b 100644
--- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state.yml
+++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: state
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status-service_instance_id.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status-service_instance_id.yml
index d001ddc7b3..16b875373b 100644
---
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status-service_instance_id.yml
+++
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status-service_instance_id.yml
@@ -21,14 +21,14 @@ results:
labels:
{{- contains .metric.labels }}
- key: status
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: service_instance_id
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status.yml
index 558e2b9d28..9aae402291 100644
--- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status.yml
+++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: status
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type-service_instance_id.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type-service_instance_id.yml
index 525408f94c..688e5d02ce 100644
---
a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type-service_instance_id.yml
+++
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type-service_instance_id.yml
@@ -21,14 +21,14 @@ results:
labels:
{{- contains .metric.labels }}
- key: type
- value: {{ .value }}
+ value: {{ notEmpty .value }}
- key: service_instance_id
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type.yml
index 625beb72f0..72809d79fe 100644
--- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type.yml
+++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: type
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value.yml
b/test/e2e-v2/cases/nginx/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/nginx/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/nodejs/expected/metrics-has-value.yml
b/test/e2e-v2/cases/nodejs/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/nodejs/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/nodejs/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/php/e2e.yaml b/test/e2e-v2/cases/php/e2e.yaml
index 3b559c6f58..0c6c3edff2 100644
--- a/test/e2e-v2/cases/php/e2e.yaml
+++ b/test/e2e-v2/cases/php/e2e.yaml
@@ -85,11 +85,11 @@ verify:
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=service_instance_sla --instance-name=provider1
--service-name=e2e-service-provider
expected: expected/metrics-has-value.yml
# service endpoint metrics
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=endpoint_cpm --endpoint-name=/php/info --service-name=php
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=endpoint_cpm --endpoint-name=POST:/php/info --service-name=php
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=endpoint_resp_time --endpoint-name=/php/info --service-name=php
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=endpoint_resp_time --endpoint-name=POST:/php/info
--service-name=php
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=endpoint_sla --endpoint-name=/php/info --service-name=php
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=endpoint_sla --endpoint-name=POST:/php/info --service-name=php
expected: expected/metrics-has-value.yml
# service relation metrics
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=service_relation_client_cpm --service-name=php
--dest-service-name=e2e-service-provider
diff --git a/test/e2e-v2/cases/php/expected/metrics-has-value.yml
b/test/e2e-v2/cases/php/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/php/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/php/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-has-value.yml
b/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-has-value.yml
index d228fd61ed..371c50f059 100644
--- a/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/profiling/ebpf/continuous/expected/metrics-has-value.yml
b/test/e2e-v2/cases/profiling/ebpf/continuous/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/profiling/ebpf/continuous/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/profiling/ebpf/continuous/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml
index 6ba869f7ad..c7ff742575 100644
---
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml
+++
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml
index 3a8892fbc6..f4f05bfe1c 100644
---
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml
+++
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
@@ -54,7 +54,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
@@ -69,7 +69,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml
index 6ba869f7ad..c7ff742575 100644
---
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml
+++
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml
index d228fd61ed..371c50f059 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-bookie-label.yml
b/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-bookie-label.yml
index cb9054a2a2..00acad53dd 100644
---
a/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-bookie-label.yml
+++
b/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-bookie-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-broker-label.yml
b/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-broker-label.yml
index 7cdaa6e612..3e7c8955de 100644
---
a/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-broker-label.yml
+++
b/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-broker-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/pulsar/expected/metrics-has-value.yml
b/test/e2e-v2/cases/pulsar/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/pulsar/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/pulsar/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/pulsar/pulsar-cases.yaml
b/test/e2e-v2/cases/pulsar/pulsar-cases.yaml
index e450720740..f6d2c80323 100644
--- a/test/e2e-v2/cases/pulsar/pulsar-cases.yaml
+++ b/test/e2e-v2/cases/pulsar/pulsar-cases.yaml
@@ -48,29 +48,29 @@ cases:
expected: expected/metrics-has-value.yml
# service cases for pulsar-broker
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_active_connections
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_active_connections
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_total_connections
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_total_connections
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_connection_create_success_count
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_connection_create_success_count
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_connection_create_fail_count
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_connection_create_fail_count
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_connection_closed_total_count
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_connection_closed_total_count
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_memory_used
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_memory_used
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_memory_committed
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_memory_committed
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_memory_init
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_memory_init
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_threads_current
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_threads_current
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_threads_daemon
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_threads_daemon
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_threads_peak
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_threads_peak
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_threads_deadlocked
--service-name=pulsar::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_pulsar_broker_jvm_threads_deadlocked
--service-name=pulsar::pulsar-cluster --instance-name=broker:8080
expected: expected/metrics-has-value.yml
# service cases for the bookkeeper cluster
@@ -97,33 +97,33 @@ cases:
# service cases for the bookkeeper node
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_thread_executor_completed
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_thread_executor_completed
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_thread_executor_tasks_completed
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_thread_executor_tasks_completed
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_thread_executor_tasks_rejected
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_thread_executor_tasks_rejected
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_thread_executor_tasks_failed
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_thread_executor_tasks_failed
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_high_priority_threads
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_high_priority_threads
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_read_thread_pool_threads
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_read_thread_pool_threads
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_high_priority_thread_max_queue_size
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_high_priority_thread_max_queue_size
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_read_thread_pool_max_queue_size
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_read_thread_pool_max_queue_size
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_memory_used
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_memory_used
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_memory_committed
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_memory_committed
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_memory_init
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_memory_init
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_threads_current
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_threads_current
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_threads_daemon
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_threads_daemon
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_threads_peak
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_threads_peak
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_threads_deadlocked
--service-name=bookkeeper::pulsar-cluster
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_bookkeeper_node_jvm_threads_deadlocked
--service-name=bookkeeper::pulsar-cluster --instance-name=bookie:8000
expected: expected/metrics-has-value.yml
\ No newline at end of file
diff --git a/test/e2e-v2/cases/python/expected/metrics-has-value.yml
b/test/e2e-v2/cases/python/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/python/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/python/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/redis/expected/metrics-has-value.yml
b/test/e2e-v2/cases/redis/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/redis/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/redis/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
b/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
index 2461b74e3f..9609609db6 100644
--- a/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
+++ b/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
@@ -76,7 +76,7 @@ verify:
# native meter: instance meter
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_jvm_memory_used --instance-name=provider1
--service-name=e2e-service-provider
- expected: expected/metrics-has-value.yml
+ expected: expected/metrics-no-value.yml
# native event: event list
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql event list
diff --git
a/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-has-value.yml
b/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
---
a/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-has-value.yml
+++
b/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/kong/expected/metrics-single-value.yml
b/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-no-value.yml
similarity index 95%
copy from test/e2e-v2/cases/kong/expected/metrics-single-value.yml
copy to
test/e2e-v2/cases/satellite/native-protocols/expected/metrics-no-value.yml
index c29e995991..19fffb9ce5 100644
--- a/test/e2e-v2/cases/kong/expected/metrics-single-value.yml
+++ b/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-no-value.yml
@@ -14,7 +14,7 @@
# limitations under the License.
debuggingtrace: null
-type: SINGLE_VALUE
+type: TIME_SERIES_VALUES
results:
{{- contains .results }}
- metric:
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: null
owner: null
traceid: null
{{- end}}
diff --git a/test/e2e-v2/cases/simple/expected/metrics-has-value-percentile.yml
b/test/e2e-v2/cases/simple/expected/metrics-has-value-percentile.yml
index cfce15019f..2ca902c8b0 100644
--- a/test/e2e-v2/cases/simple/expected/metrics-has-value-percentile.yml
+++ b/test/e2e-v2/cases/simple/expected/metrics-has-value-percentile.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/simple/expected/metrics-has-value.yml
b/test/e2e-v2/cases/simple/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/simple/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/simple/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/so11y/expected/metrics-has-memory-value-label.yml
b/test/e2e-v2/cases/so11y/expected/metrics-has-memory-value-label.yml
index 8b5a24de62..ccb9028a9e 100644
--- a/test/e2e-v2/cases/so11y/expected/metrics-has-memory-value-label.yml
+++ b/test/e2e-v2/cases/so11y/expected/metrics-has-memory-value-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/so11y/expected/metrics-has-value-label-trace.yml
b/test/e2e-v2/cases/so11y/expected/metrics-has-value-label-trace.yml
index 3d05bc8de8..d416e3ca52 100644
--- a/test/e2e-v2/cases/so11y/expected/metrics-has-value-label-trace.yml
+++ b/test/e2e-v2/cases/so11y/expected/metrics-has-value-label-trace.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/so11y/expected/metrics-has-value-label.yml
b/test/e2e-v2/cases/so11y/expected/metrics-has-value-label.yml
index f69256342b..5e812feb7a 100644
--- a/test/e2e-v2/cases/so11y/expected/metrics-has-value-label.yml
+++ b/test/e2e-v2/cases/so11y/expected/metrics-has-value-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/so11y/expected/metrics-has-value.yml
b/test/e2e-v2/cases/so11y/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/so11y/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/so11y/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
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
index cfce15019f..2ca902c8b0 100644
--- a/test/e2e-v2/cases/storage/expected/metrics-has-value-percentile.yml
+++ b/test/e2e-v2/cases/storage/expected/metrics-has-value-percentile.yml
@@ -21,12 +21,12 @@ results:
labels:
{{- contains .metric.labels }}
- key: p
- value: {{ .value }}
+ value: {{ notEmpty .value }}
{{- end}}
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/storage/expected/metrics-has-value.yml
b/test/e2e-v2/cases/storage/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/storage/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/storage/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/ttl/expected/metrics-has-value.yml
b/test/e2e-v2/cases/ttl/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/ttl/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/ttl/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label-zabbix.yml
b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label-zabbix.yml
index 2189b5dc8a..b8b65508f8 100644
--- a/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label-zabbix.yml
+++ b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label-zabbix.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml
b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml
index 85c2d872c4..db27192aee 100644
--- a/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml
+++ b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git
a/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml
b/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml
index a803e4dd8a..10396c68aa 100644
--- a/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml
+++ b/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml
@@ -24,7 +24,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
@@ -39,7 +39,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
b/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
index 37b19de246..cae6688aec 100644
--- a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
owner: null
traceid: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml
b/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml
index 084fd60951..515170725b 100644
--- a/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml
+++ b/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml
@@ -26,7 +26,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
diff --git a/test/e2e-v2/cases/win/expected/metrics-has-value.yml
b/test/e2e-v2/cases/win/expected/metrics-has-value.yml
index 458c5980ac..979b9b2577 100644
--- a/test/e2e-v2/cases/win/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/win/expected/metrics-has-value.yml
@@ -22,7 +22,7 @@ results:
values:
{{- contains .values }}
- id: {{ notEmpty .id }}
- value: {{ .value }}
+ value: {{ notEmpty .value }}
traceid: null
owner: null
- id: {{ notEmpty .id }}
