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 054e01a6b1 E2E: fix log test miss verify LAL and metrics (#8981)
054e01a6b1 is described below
commit 054e01a6b17f04724b070d5fb8c45bd9854dc27c
Author: Wan Kai <[email protected]>
AuthorDate: Tue May 3 17:08:25 2022 +0800
E2E: fix log test miss verify LAL and metrics (#8981)
* E2E: fix log test miss verify LAL and metrics
* fix kafka log case, set rover test interval 10s
---
docs/en/changes/changes.md | 1 +
test/e2e-v2/cases/kafka/log/e2e.yaml | 2 +-
.../e2e-v2/cases/log/expected/metrics-has-value.yml | 19 +++++++++++++++++++
.../log/{log-cases.yaml => log-cases-base.yaml} | 0
test/e2e-v2/cases/log/log-cases.yaml | 21 +++++----------------
test/e2e-v2/cases/rover/process/istio/e2e.yaml | 2 +-
6 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 2924c33367..9bff422360 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -33,6 +33,7 @@
* Support autocomplete tags in traces query.
* [Breaking Change] Replace all configurations `**_JETTY_**` to `**_REST_**`.
* Add the support eBPF profiling field into the process entity.
+* E2E: fix log test miss verify LAL and metrics.
#### UI
diff --git a/test/e2e-v2/cases/kafka/log/e2e.yaml
b/test/e2e-v2/cases/kafka/log/e2e.yaml
index e2ea81750e..ec3ae06b61 100644
--- a/test/e2e-v2/cases/kafka/log/e2e.yaml
+++ b/test/e2e-v2/cases/kafka/log/e2e.yaml
@@ -44,7 +44,7 @@ verify:
interval: 3s
cases:
- includes:
- - ../../log/log-cases.yaml
+ - ../../log/log-cases-base.yaml
# filebeat
- query: |
curl -X POST
http://${provider_host}:${provider_9090}/file/logs/trigger > /dev/null;
diff --git a/test/e2e-v2/cases/log/expected/metrics-has-value.yml
b/test/e2e-v2/cases/log/expected/metrics-has-value.yml
new file mode 100644
index 0000000000..5359e6d315
--- /dev/null
+++ b/test/e2e-v2/cases/log/expected/metrics-has-value.yml
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- contains . }}
+- key: {{ notEmpty .key }}
+ value: {{ ge .value 1 }}
+{{- end }}
diff --git a/test/e2e-v2/cases/log/log-cases.yaml
b/test/e2e-v2/cases/log/log-cases-base.yaml
similarity index 100%
copy from test/e2e-v2/cases/log/log-cases.yaml
copy to test/e2e-v2/cases/log/log-cases-base.yaml
diff --git a/test/e2e-v2/cases/log/log-cases.yaml
b/test/e2e-v2/cases/log/log-cases.yaml
index aca5691a28..85bf692b59 100644
--- a/test/e2e-v2/cases/log/log-cases.yaml
+++ b/test/e2e-v2/cases/log/log-cases.yaml
@@ -14,19 +14,8 @@
# limitations under the License.
cases:
- # service list
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql service layer GENERAL
- expected: expected/service.yml
- # service endpoint
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql endpoint list
--keyword=users --service-name=e2e-service-provider
- expected: expected/service-endpoint.yml
- # service instance list
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql instance list
--service-name=e2e-service-provider
- expected: expected/service-instance.yml
- # logs
- - query: |
- swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql logs list
--service-name=e2e-service-provider --trace-id=$( \
- swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql trace ls \
- | yq e '.traces | select(.[].endpointnames[0]=="POST:/users") |
.[0].traceids[0]' -
- )
- expected: expected/logs.yml
+ - includes:
+ - log-cases-base.yaml
+ # metrics
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=log_count_info --instance-name=provider1
--service-name=e2e-service-provider |yq e 'to_entries' -
+ expected: expected/metrics-has-value.yml
diff --git a/test/e2e-v2/cases/rover/process/istio/e2e.yaml
b/test/e2e-v2/cases/rover/process/istio/e2e.yaml
index 647402453c..35043bff13 100644
--- a/test/e2e-v2/cases/rover/process/istio/e2e.yaml
+++ b/test/e2e-v2/cases/rover/process/istio/e2e.yaml
@@ -89,7 +89,7 @@ setup:
verify:
retry:
count: 20
- interval: 3s
+ interval: 10s
cases:
# service list
- query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
service ls
