You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/10/22 04:59:11 UTC
[skywalking] branch master updated: e2e-v2: Simplified cluster e2e
to reduce failure (#7989)
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 f13502f e2e-v2: Simplified cluster e2e to reduce failure (#7989)
f13502f is described below
commit f13502fc2c0e3d6dc2947ca0114590a65cdb8657
Author: wankai123 <wa...@foxmail.com>
AuthorDate: Fri Oct 22 12:58:52 2021 +0800
e2e-v2: Simplified cluster e2e to reduce failure (#7989)
---
test/e2e-v2/cases/cluster/cluster-cases.yaml | 10 --
.../cases/cluster/expected/dependency-instance.yml | 14 ---
.../cluster/expected/service-instance-provider.yml | 21 ----
.../cases/cluster/expected/trace-users-detail.yml | 136 ---------------------
test/e2e-v2/cases/cluster/zk/es/docker-compose.yml | 17 +--
.../cases/cluster/zk/influxdb/docker-compose.yml | 17 +--
.../cases/cluster/zk/mysql/docker-compose.yml | 18 +--
.../profile/expected/profile-logs-finished.yml | 27 ----
test/e2e-v2/cases/profile/profile-cases.yaml | 6 -
9 files changed, 7 insertions(+), 259 deletions(-)
diff --git a/test/e2e-v2/cases/cluster/cluster-cases.yaml b/test/e2e-v2/cases/cluster/cluster-cases.yaml
index 97b7053..a81c543 100644
--- a/test/e2e-v2/cases/cluster/cluster-cases.yaml
+++ b/test/e2e-v2/cases/cluster/cluster-cases.yaml
@@ -74,12 +74,6 @@
expected: expected/metrics-has-value.yml
- query: swctl --display yaml --base-url=http://${ui_host}:${ui_8080}/graphql metrics linear --name=service_instance_sla --instance-name=provider1 --service-name=e2e-service-provider |yq e 'to_entries' -
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml --base-url=http://${ui_host}:${ui_8080}/graphql metrics linear --name=service_instance_resp_time --instance-name=provider2 --service-name=e2e-service-provider |yq e 'to_entries' -
- expected: expected/metrics-has-value.yml
- - query: swctl --display yaml --base-url=http://${ui_host}:${ui_8080}/graphql metrics linear --name=service_instance_cpm --instance-name=provider2 --service-name=e2e-service-provider |yq e 'to_entries' -
- expected: expected/metrics-has-value.yml
- - query: swctl --display yaml --base-url=http://${ui_host}:${ui_8080}/graphql metrics linear --name=service_instance_sla --instance-name=provider2 --service-name=e2e-service-provider |yq e 'to_entries' -
- expected: expected/metrics-has-value.yml
- query: swctl --display yaml --base-url=http://${ui_host}:${ui_8080}/graphql metrics linear --name=service_instance_resp_time --instance-name=consumer1 --service-name=e2e-service-consumer |yq e 'to_entries' -
expected: expected/metrics-has-value.yml
- query: swctl --display yaml --base-url=http://${ui_host}:${ui_8080}/graphql metrics linear --name=service_instance_cpm --instance-name=consumer1 --service-name=e2e-service-consumer |yq e 'to_entries' -
@@ -116,8 +110,4 @@
expected: expected/metrics-has-value.yml
- query: swctl --display yaml --base-url=http://${ui_host}:${ui_8080}/graphql metrics linear --name=service_instance_relation_client_cpm --instance-name=consumer1 --service-name=e2e-service-consumer --dest-instance-name=provider1 --dest-service-name=e2e-service-provider |yq e 'to_entries' -
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml --base-url=http://${ui_host}:${ui_8080}/graphql metrics linear --name=service_instance_relation_server_cpm --instance-name=consumer1 --service-name=e2e-service-consumer --dest-instance-name=provider2 --dest-service-name=e2e-service-provider |yq e 'to_entries' -
- expected: expected/metrics-has-value.yml
- - query: swctl --display yaml --base-url=http://${ui_host}:${ui_8080}/graphql metrics linear --name=service_instance_relation_client_cpm --instance-name=consumer1 --service-name=e2e-service-consumer --dest-instance-name=provider2 --dest-service-name=e2e-service-provider |yq e 'to_entries' -
- expected: expected/metrics-has-value.yml
diff --git a/test/e2e-v2/cases/cluster/expected/dependency-instance.yml b/test/e2e-v2/cases/cluster/expected/dependency-instance.yml
index 3b49271..d3b9547 100644
--- a/test/e2e-v2/cases/cluster/expected/dependency-instance.yml
+++ b/test/e2e-v2/cases/cluster/expected/dependency-instance.yml
@@ -27,12 +27,6 @@ nodes:
servicename: e2e-service-provider
type: "Tomcat"
isreal: true
-- id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }}
- name: provider2
- serviceid: {{ b64enc "e2e-service-provider" }}.1
- servicename: e2e-service-provider
- type: "Tomcat"
- isreal: true
{{- end }}
calls:
{{- contains .calls }}
@@ -44,12 +38,4 @@ calls:
detectpoints:
- CLIENT
- SERVER
-- source: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }}
- sourcecomponents: []
- target: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }}
- targetcomponents: []
- id: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }}-{{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }}
- detectpoints:
- - CLIENT
- - SERVER
{{- end }}
diff --git a/test/e2e-v2/cases/cluster/expected/service-instance-provider.yml b/test/e2e-v2/cases/cluster/expected/service-instance-provider.yml
index a4cbe2c..e525205 100644
--- a/test/e2e-v2/cases/cluster/expected/service-instance-provider.yml
+++ b/test/e2e-v2/cases/cluster/expected/service-instance-provider.yml
@@ -37,25 +37,4 @@
{{- end}}
language: JAVA
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
-- id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }}
- name: provider2
- 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: {{ notEmpty .value }}
- {{- end}}
- language: JAVA
- instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }}
{{- end}}
diff --git a/test/e2e-v2/cases/cluster/expected/trace-users-detail.yml b/test/e2e-v2/cases/cluster/expected/trace-users-detail.yml
index 73548c4..e533d1d 100644
--- a/test/e2e-v2/cases/cluster/expected/trace-users-detail.yml
+++ b/test/e2e-v2/cases/cluster/expected/trace-users-detail.yml
@@ -174,140 +174,4 @@ spans:
layer: Unknown
tags: []
logs: []
- - traceid: {{ notEmpty .traceid }}
- segmentid: {{ notEmpty .segmentid }}
- spanid: {{ .spanid }}
- parentspanid: {{ .parentspanid }}
- refs: []
- servicecode: e2e-service-consumer
- serviceinstancename: consumer1
- starttime: {{ gt .starttime 0 }}
- endtime: {{ gt .endtime 0 }}
- endpointname: /users
- type: Exit
- peer: provider2:9090
- component: SpringRestTemplate
- iserror: false
- layer: Http
- tags:
- {{- contains .tags }}
- - key: url
- value: http://provider2:9090/users
- - key: http.method
- value: POST
- {{- end }}
- logs: []
- - traceid: {{ notEmpty .traceid }}
- segmentid: {{ notEmpty .segmentid }}
- spanid: {{ .spanid }}
- parentspanid: {{ .parentspanid }}
- refs:
- {{- contains .refs }}
- - traceid: {{ notEmpty .traceid }}
- parentsegmentid: {{ notEmpty .parentsegmentid }}
- parentspanid: {{ .parentspanid }}
- type: CROSS_PROCESS
- {{- end }}
- servicecode: e2e-service-provider
- serviceinstancename: provider2
- starttime: {{ gt .starttime 0 }}
- endtime: {{ gt .endtime 0 }}
- endpointname: POST:/users
- type: Entry
- peer: ""
- component: Tomcat
- iserror: false
- layer: Http
- tags:
- {{- contains .tags }}
- - key: url
- value: http://provider2:9090/users
- - key: http.method
- value: POST
- {{- end }}
- logs: []
- - traceid: {{ notEmpty .traceid }}
- segmentid: {{ notEmpty .segmentid }}
- spanid: {{ .spanid }}
- parentspanid: {{ .parentspanid }}
- refs: []
- servicecode: e2e-service-provider
- serviceinstancename: provider2
- starttime: {{ gt .starttime 0 }}
- endtime: {{ gt .endtime 0 }}
- endpointname: HikariCP/Connection/getConnection
- type: Local
- peer: ""
- component: HikariCP
- iserror: false
- layer: Unknown
- tags: []
- logs: []
- - traceid: {{ notEmpty .traceid }}
- segmentid: {{ notEmpty .segmentid }}
- spanid: {{ .spanid }}
- parentspanid: {{ .parentspanid }}
- refs: []
- servicecode: e2e-service-provider
- serviceinstancename: provider2
- starttime: {{ gt .starttime 0 }}
- endtime: {{ gt .endtime 0 }}
- endpointname: H2/JDBI/PreparedStatement/executeQuery
- type: Exit
- peer: localhost:-1
- component: h2-jdbc-driver
- iserror: false
- layer: Database
- tags:
- {{- contains .tags }}
- - key: db.type
- value: sql
- - key: db.instance
- value: testdb
- - key: db.statement
- value: {{ notEmpty .value }}
- {{- end }}
- logs: []
- - traceid: {{ notEmpty .traceid }}
- segmentid: {{ notEmpty .segmentid }}
- spanid: {{ .spanid }}
- parentspanid: {{ .parentspanid }}
- refs: []
- servicecode: e2e-service-provider
- serviceinstancename: provider2
- starttime: {{ gt .starttime 0 }}
- endtime: {{ gt .endtime 0 }}
- endpointname: H2/JDBI/Connection/commit
- type: Exit
- peer: localhost:-1
- component: h2-jdbc-driver
- iserror: false
- layer: Database
- tags:
- {{- contains .tags }}
- - key: db.type
- value: sql
- - key: db.instance
- value: testdb
- - key: db.statement
- value: ""
- {{- end }}
- logs: []
- - traceid: {{ notEmpty .traceid }}
- segmentid: {{ notEmpty .segmentid }}
- spanid: {{ .spanid }}
- parentspanid: {{ .parentspanid }}
- refs: []
- servicecode: e2e-service-provider
- serviceinstancename: provider2
- starttime: {{ gt .starttime 0 }}
- endtime: {{ gt .endtime 0 }}
- endpointname: HikariCP/Connection/close
- type: Local
- peer: ""
- component: HikariCP
- iserror: false
- layer: Unknown
- tags: []
- logs: []
{{- end }}
diff --git a/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml b/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml
index b7f87bc..9822db9 100644
--- a/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml
+++ b/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml
@@ -90,19 +90,8 @@ services:
file: ../../../../script/docker-compose/base-compose.yml
service: provider
environment:
- SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800
- SW_AGENT_INSTANCE_NAME: provider1
- depends_on:
- oap1:
- condition: service_healthy
-
- provider2:
- extends:
- file: ../../../../script/docker-compose/base-compose.yml
- service: provider
- environment:
SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap2:11800
- SW_AGENT_INSTANCE_NAME: provider2
+ SW_AGENT_INSTANCE_NAME: provider1
depends_on:
oap2:
condition: service_healthy
@@ -113,14 +102,12 @@ services:
service: consumer
environment:
SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800
- PROVIDER_URL: http://provider1:9090,http://provider2:9090
+ PROVIDER_URL: http://provider1:9090
depends_on:
oap1:
condition: service_healthy
provider1:
condition: service_healthy
- provider2:
- condition: service_healthy
ports:
- 9092
networks:
diff --git a/test/e2e-v2/cases/cluster/zk/influxdb/docker-compose.yml b/test/e2e-v2/cases/cluster/zk/influxdb/docker-compose.yml
index 7e8c6e7..8a63f5c 100644
--- a/test/e2e-v2/cases/cluster/zk/influxdb/docker-compose.yml
+++ b/test/e2e-v2/cases/cluster/zk/influxdb/docker-compose.yml
@@ -87,19 +87,8 @@ services:
file: ../../../../script/docker-compose/base-compose.yml
service: provider
environment:
- SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800
- SW_AGENT_INSTANCE_NAME: provider1
- depends_on:
- oap1:
- condition: service_healthy
-
- provider2:
- extends:
- file: ../../../../script/docker-compose/base-compose.yml
- service: provider
- environment:
SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap2:11800
- SW_AGENT_INSTANCE_NAME: provider2
+ SW_AGENT_INSTANCE_NAME: provider1
depends_on:
oap2:
condition: service_healthy
@@ -110,14 +99,12 @@ services:
service: consumer
environment:
SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800
- PROVIDER_URL: http://provider1:9090,http://provider2:9090
+ PROVIDER_URL: http://provider1:9090
depends_on:
oap1:
condition: service_healthy
provider1:
condition: service_healthy
- provider2:
- condition: service_healthy
ports:
- 9092
networks:
diff --git a/test/e2e-v2/cases/cluster/zk/mysql/docker-compose.yml b/test/e2e-v2/cases/cluster/zk/mysql/docker-compose.yml
index aa71123..7700e94 100644
--- a/test/e2e-v2/cases/cluster/zk/mysql/docker-compose.yml
+++ b/test/e2e-v2/cases/cluster/zk/mysql/docker-compose.yml
@@ -93,19 +93,8 @@ services:
file: ../../../../script/docker-compose/base-compose.yml
service: provider
environment:
- SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800
- SW_AGENT_INSTANCE_NAME: provider1
- depends_on:
- oap1:
- condition: service_healthy
-
- provider2:
- extends:
- file: ../../../../script/docker-compose/base-compose.yml
- service: provider
- environment:
SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap2:11800
- SW_AGENT_INSTANCE_NAME: provider2
+ SW_AGENT_INSTANCE_NAME: provider1
depends_on:
oap2:
condition: service_healthy
@@ -116,14 +105,13 @@ services:
service: consumer
environment:
SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800
- PROVIDER_URL: http://provider1:9090,http://provider2:9090
+ PROVIDER_URL: http://provider1:9090
depends_on:
oap1:
condition: service_healthy
provider1:
condition: service_healthy
- provider2:
- condition: service_healthy
+
ports:
- 9092
networks:
diff --git a/test/e2e-v2/cases/profile/expected/profile-logs-finished.yml b/test/e2e-v2/cases/profile/expected/profile-logs-finished.yml
deleted file mode 100644
index 5838b2d..0000000
--- a/test/e2e-v2/cases/profile/expected/profile-logs-finished.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 . }}
-- id: {{ notEmpty .id }}
- instanceid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
- operationtype: NOTIFIED
- instancename: provider1
- operationtime: {{ gt .operationtime 0 }}
-- id: {{ notEmpty .id }}
- instanceid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
- operationtype: EXECUTION_FINISHED
- instancename: provider1
- operationtime: {{ gt .operationtime 0 }}
-{{- end }}
\ No newline at end of file
diff --git a/test/e2e-v2/cases/profile/profile-cases.yaml b/test/e2e-v2/cases/profile/profile-cases.yaml
index 7f124e5..7c27b58 100644
--- a/test/e2e-v2/cases/profile/profile-cases.yaml
+++ b/test/e2e-v2/cases/profile/profile-cases.yaml
@@ -49,12 +49,6 @@
sleep 10;
swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql profile list -service-name=e2e-service-provider --endpoint-name=POST:/profile/{name}
expected: expected/profile-list-finished.yml
- # profile logs
- - query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql profile logs --task-id=$( \
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql profile list --service-name=e2e-service-provider --endpoint-name=POST:/profile/{name} | yq e '.[0].id' - \
- )
- expected: expected/profile-logs-finished.yml
# profiled segment list
- query: |
swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql profile segment-list --task-id=$( \