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 2023/03/21 06:45:24 UTC
[skywalking] branch master updated: Adapt the service level component in E2E (#10530)
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 c217ead555 Adapt the service level component in E2E (#10530)
c217ead555 is described below
commit c217ead55516100ab1a40cd9378c346074dde28b
Author: mrproliu <74...@qq.com>
AuthorDate: Tue Mar 21 14:45:14 2023 +0800
Adapt the service level component in E2E (#10530)
---
test/e2e-v2/cases/browser/expected/dependency.yml | 6 +++--
.../expected/dependency-services-consumer.yml | 6 +++--
.../expected/dependency-services-provider.yml | 6 +++--
.../cases/go/expected/dependency-services-go.yml | 12 ++++++----
.../expected/dependency-services-productpage.yml | 27 +++++++++++++++++-----
.../als/expected/dependency-services-reviews.yml | 18 +++++++++++----
.../expected/dependency-services-productpage.yml | 9 +++++---
.../cases/lua/expected/dependency-services.yml | 12 ++++++----
.../dependency-services-consumer-nodejs.yml | 9 +++++---
.../expected/dependency-services-consumer.yml | 12 ++++++----
.../dependency-services-provider-nodejs.yml | 6 +++--
.../cases/php/expected/dependency-services-php.yml | 9 +++++---
.../php/expected/dependency-services-provider.yml | 9 +++++---
.../expected/dependency-services-consumer-py.yml | 15 ++++++++----
.../expected/dependency-services-provider-py.yml | 6 +++--
.../expected/dependency-services.yml | 6 +++--
.../expected/dependency-services-consumer.yml | 9 +++++---
.../expected/dependency-services-provider.yml | 9 +++++---
.../expected/dependency-services-consumer.yml | 9 +++++---
.../expected/dependency-services-provider.yml | 9 +++++---
test/e2e-v2/script/env | 2 +-
21 files changed, 142 insertions(+), 64 deletions(-)
diff --git a/test/e2e-v2/cases/browser/expected/dependency.yml b/test/e2e-v2/cases/browser/expected/dependency.yml
index 7cd89cd66a..db15fc6fe1 100644
--- a/test/e2e-v2/cases/browser/expected/dependency.yml
+++ b/test/e2e-v2/cases/browser/expected/dependency.yml
@@ -27,9 +27,11 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "test-ui<browser>"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - ajax
target: {{ b64enc "provider-py"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Python
id: {{ b64enc "test-ui<browser>"}}.1-{{ b64enc "provider-py"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/gateway/expected/dependency-services-consumer.yml b/test/e2e-v2/cases/gateway/expected/dependency-services-consumer.yml
index 851303ff7b..4c8f66f4a8 100644
--- a/test/e2e-v2/cases/gateway/expected/dependency-services-consumer.yml
+++ b/test/e2e-v2/cases/gateway/expected/dependency-services-consumer.yml
@@ -31,7 +31,8 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "gateway:80" }}.0
targetcomponents: []
id: {{ b64enc "e2e-service-consumer" }}.1-{{ b64enc "gateway:80" }}.0
@@ -40,7 +41,8 @@ calls:
- source: {{ b64enc "User" }}.0
sourcecomponents: []
target: {{ b64enc "e2e-service-consumer" }}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "User" }}.0-{{ b64enc "e2e-service-consumer" }}.1
detectpoints:
- SERVER
diff --git a/test/e2e-v2/cases/gateway/expected/dependency-services-provider.yml b/test/e2e-v2/cases/gateway/expected/dependency-services-provider.yml
index 941adbe71f..e37c6b732a 100644
--- a/test/e2e-v2/cases/gateway/expected/dependency-services-provider.yml
+++ b/test/e2e-v2/cases/gateway/expected/dependency-services-provider.yml
@@ -31,7 +31,8 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-provider" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - h2-jdbc-driver
target: {{ b64enc "localhost:-1" }}.0
targetcomponents: []
id: {{ b64enc "e2e-service-provider" }}.1-{{ b64enc "localhost:-1" }}.0
@@ -40,7 +41,8 @@ calls:
- source: {{ b64enc "gateway:80"}}.0
sourcecomponents: []
target: {{ b64enc "e2e-service-provider" }}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "gateway:80" }}.0-{{ b64enc "e2e-service-provider" }}.1
detectpoints:
- SERVER
diff --git a/test/e2e-v2/cases/go/expected/dependency-services-go.yml b/test/e2e-v2/cases/go/expected/dependency-services-go.yml
index 19d30ba5bd..2c96e90531 100644
--- a/test/e2e-v2/cases/go/expected/dependency-services-go.yml
+++ b/test/e2e-v2/cases/go/expected/dependency-services-go.yml
@@ -31,17 +31,21 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "go2sky"}}.1
- targetcomponents: []
+ targetcomponents:
+ - GoHttpServer
id: {{ b64enc "e2e-service-consumer"}}.1-{{ b64enc "go2sky"}}.1
detectpoints:
- CLIENT
- SERVER
- source: {{ b64enc "go2sky" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - GoHttpClient
target: {{ b64enc "e2e-service-provider"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "go2sky" }}.1-{{ b64enc "e2e-service-provider"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/istio/als/expected/dependency-services-productpage.yml b/test/e2e-v2/cases/istio/als/expected/dependency-services-productpage.yml
index 39589b7a92..1115fe4247 100644
--- a/test/e2e-v2/cases/istio/als/expected/dependency-services-productpage.yml
+++ b/test/e2e-v2/cases/istio/als/expected/dependency-services-productpage.yml
@@ -35,25 +35,40 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e::istio-ingressgateway"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - http
target: {{ b64enc "e2e::productpage"}}.1
- targetcomponents: []
+ targetcomponents:
+ {{- contains .targetcomponents }}
+ - http
+ - mtls
+ {{- end }}
id: {{ b64enc "e2e::istio-ingressgateway"}}.1-{{ b64enc "e2e::productpage"}}.1
detectpoints:
- CLIENT
- SERVER
- source: {{ b64enc "e2e::productpage"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - http
target: {{ b64enc "e2e::details"}}.1
- targetcomponents: []
+ targetcomponents:
+ {{- contains .targetcomponents }}
+ - http
+ - mtls
+ {{- end }}
id: {{ b64enc "e2e::productpage"}}.1-{{ b64enc "e2e::details"}}.1
detectpoints:
- CLIENT
- SERVER
- source: {{ b64enc "e2e::productpage" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - http
target: {{ b64enc "e2e::reviews"}}.1
- targetcomponents: []
+ targetcomponents:
+ {{- contains .targetcomponents }}
+ - http
+ - mtls
+ {{- end }}
id: {{ b64enc "e2e::productpage" }}.1-{{ b64enc "e2e::reviews"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/istio/als/expected/dependency-services-reviews.yml b/test/e2e-v2/cases/istio/als/expected/dependency-services-reviews.yml
index d41c779870..b69ec4ae1b 100644
--- a/test/e2e-v2/cases/istio/als/expected/dependency-services-reviews.yml
+++ b/test/e2e-v2/cases/istio/als/expected/dependency-services-reviews.yml
@@ -31,17 +31,27 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e::productpage"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - http
target: {{ b64enc "e2e::reviews"}}.1
- targetcomponents: []
+ targetcomponents:
+ {{- contains .targetcomponents }}
+ - http
+ - mtls
+ {{- end }}
id: {{ b64enc "e2e::productpage"}}.1-{{ b64enc "e2e::reviews"}}.1
detectpoints:
- CLIENT
- SERVER
- source: {{ b64enc "e2e::reviews" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - http
target: {{ b64enc "e2e::ratings"}}.1
- targetcomponents: []
+ targetcomponents:
+ {{- contains .targetcomponents }}
+ - http
+ - mtls
+ {{- end }}
id: {{ b64enc "e2e::reviews" }}.1-{{ b64enc "e2e::ratings"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/istio/metrics/expected/dependency-services-productpage.yml b/test/e2e-v2/cases/istio/metrics/expected/dependency-services-productpage.yml
index 5a57b75f35..3759299c8d 100644
--- a/test/e2e-v2/cases/istio/metrics/expected/dependency-services-productpage.yml
+++ b/test/e2e-v2/cases/istio/metrics/expected/dependency-services-productpage.yml
@@ -35,21 +35,24 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e::istio-ingressgateway"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - Unknown
target: {{ b64enc "e2e::productpage"}}.1
targetcomponents: []
id: {{ b64enc "e2e::istio-ingressgateway"}}.1-{{ b64enc "e2e::productpage"}}.1
detectpoints:
- CLIENT
- source: {{ b64enc "e2e::productpage"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - Unknown
target: {{ b64enc "e2e::details"}}.1
targetcomponents: []
id: {{ b64enc "e2e::productpage"}}.1-{{ b64enc "e2e::details"}}.1
detectpoints:
- CLIENT
- source: {{ b64enc "e2e::productpage" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - Unknown
target: {{ b64enc "e2e::reviews"}}.1
targetcomponents: []
id: {{ b64enc "e2e::productpage" }}.1-{{ b64enc "e2e::reviews"}}.1
diff --git a/test/e2e-v2/cases/lua/expected/dependency-services.yml b/test/e2e-v2/cases/lua/expected/dependency-services.yml
index cd28d5a618..8f2b3152fb 100644
--- a/test/e2e-v2/cases/lua/expected/dependency-services.yml
+++ b/test/e2e-v2/cases/lua/expected/dependency-services.yml
@@ -31,7 +31,8 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-entry-provider" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "e2e-service-end-provider"}}.1
targetcomponents: []
id: {{ b64enc "e2e-service-entry-provider" }}.1-{{ b64enc "e2e-service-end-provider"}}.1
@@ -40,14 +41,17 @@ calls:
- source: {{ b64enc "e2e-service-entry-provider" }}.1
sourcecomponents: []
target: {{ b64enc "User_Service_Name"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Nginx
id: {{ b64enc "e2e-service-entry-provider" }}.1-{{ b64enc "User_Service_Name"}}.1
detectpoints:
- SERVER
- source: {{ b64enc "User_Service_Name" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - Nginx
target: {{ b64enc "e2e-service-end-provider"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "User_Service_Name" }}.1-{{ b64enc "e2e-service-end-provider"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/nodejs/expected/dependency-services-consumer-nodejs.yml b/test/e2e-v2/cases/nodejs/expected/dependency-services-consumer-nodejs.yml
index 5188fc0a4f..89d3f96520 100644
--- a/test/e2e-v2/cases/nodejs/expected/dependency-services-consumer-nodejs.yml
+++ b/test/e2e-v2/cases/nodejs/expected/dependency-services-consumer-nodejs.yml
@@ -31,9 +31,11 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "consumer" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - Axios
target: {{ b64enc "e2e-service-consumer" }}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "consumer" }}.1-{{ b64enc "e2e-service-consumer" }}.1
detectpoints:
- CLIENT
@@ -41,7 +43,8 @@ calls:
- source: {{ b64enc "User" }}.0
sourcecomponents: []
target: {{ b64enc "consumer" }}.1
- targetcomponents: []
+ targetcomponents:
+ - http
id: {{ b64enc "User" }}.0-{{ b64enc "consumer" }}.1
detectpoints:
- SERVER
diff --git a/test/e2e-v2/cases/nodejs/expected/dependency-services-consumer.yml b/test/e2e-v2/cases/nodejs/expected/dependency-services-consumer.yml
index f5bf1edb14..d750b2b1f2 100644
--- a/test/e2e-v2/cases/nodejs/expected/dependency-services-consumer.yml
+++ b/test/e2e-v2/cases/nodejs/expected/dependency-services-consumer.yml
@@ -31,17 +31,21 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "provider" }}.1
- targetcomponents: []
+ targetcomponents:
+ - Express
id: {{ b64enc "e2e-service-consumer" }}.1-{{ b64enc "provider" }}.1
detectpoints:
- CLIENT
- SERVER
- source: {{ b64enc "consumer" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - Axios
target: {{ b64enc "e2e-service-consumer" }}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "consumer" }}.1-{{ b64enc "e2e-service-consumer" }}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/nodejs/expected/dependency-services-provider-nodejs.yml b/test/e2e-v2/cases/nodejs/expected/dependency-services-provider-nodejs.yml
index f3af4eb9b4..495660f51c 100644
--- a/test/e2e-v2/cases/nodejs/expected/dependency-services-provider-nodejs.yml
+++ b/test/e2e-v2/cases/nodejs/expected/dependency-services-provider-nodejs.yml
@@ -27,9 +27,11 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "provider" }}.1
- targetcomponents: []
+ targetcomponents:
+ - Express
id: {{ b64enc "e2e-service-consumer" }}.1-{{ b64enc "provider" }}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/php/expected/dependency-services-php.yml b/test/e2e-v2/cases/php/expected/dependency-services-php.yml
index cdbe878a56..55ad77c7e5 100644
--- a/test/e2e-v2/cases/php/expected/dependency-services-php.yml
+++ b/test/e2e-v2/cases/php/expected/dependency-services-php.yml
@@ -31,9 +31,11 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "php" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - cURL
target: {{ b64enc "e2e-service-provider" }}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "php" }}.1-{{ b64enc "e2e-service-provider" }}.1
detectpoints:
- CLIENT
@@ -41,7 +43,8 @@ calls:
- source: {{ b64enc "User" }}.0
sourcecomponents: []
target: {{ b64enc "php" }}.1
- targetcomponents: []
+ targetcomponents:
+ - PHP
id: {{ b64enc "User" }}.0-{{ b64enc "php" }}.1
detectpoints:
- SERVER
diff --git a/test/e2e-v2/cases/php/expected/dependency-services-provider.yml b/test/e2e-v2/cases/php/expected/dependency-services-provider.yml
index 378c93a055..b5b9426f56 100644
--- a/test/e2e-v2/cases/php/expected/dependency-services-provider.yml
+++ b/test/e2e-v2/cases/php/expected/dependency-services-provider.yml
@@ -31,15 +31,18 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "php" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - cURL
target: {{ b64enc "e2e-service-provider" }}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "php" }}.1-{{ b64enc "e2e-service-provider" }}.1
detectpoints:
- CLIENT
- SERVER
- source: {{ b64enc "e2e-service-provider" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - h2-jdbc-driver
target: {{ b64enc "localhost:-1"}}.0
targetcomponents: []
id: {{ b64enc "e2e-service-provider" }}.1-{{ b64enc "localhost:-1"}}.0
diff --git a/test/e2e-v2/cases/python/expected/dependency-services-consumer-py.yml b/test/e2e-v2/cases/python/expected/dependency-services-consumer-py.yml
index 24e1323540..5c25d6330b 100644
--- a/test/e2e-v2/cases/python/expected/dependency-services-consumer-py.yml
+++ b/test/e2e-v2/cases/python/expected/dependency-services-consumer-py.yml
@@ -37,22 +37,27 @@ calls:
- source: {{ b64enc "User"}}.0
sourcecomponents: []
target: {{ b64enc "consumer-py"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Python
id: {{ b64enc "User"}}.0-{{ b64enc "consumer-py"}}.1
detectpoints:
- SERVER
- source: {{ b64enc "consumer-py" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - Python
target: {{ b64enc "e2e-service-consumer"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "consumer-py" }}.1-{{ b64enc "e2e-service-consumer"}}.1
detectpoints:
- CLIENT
- SERVER
- source: {{ b64enc "consumer-py" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - Python
target: {{ b64enc "provider-py-kafka"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Python
id: {{ b64enc "consumer-py" }}.1-{{ b64enc "provider-py-kafka"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/python/expected/dependency-services-provider-py.yml b/test/e2e-v2/cases/python/expected/dependency-services-provider-py.yml
index 7b55e05595..619670cd4b 100644
--- a/test/e2e-v2/cases/python/expected/dependency-services-provider-py.yml
+++ b/test/e2e-v2/cases/python/expected/dependency-services-provider-py.yml
@@ -27,9 +27,11 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "provider-py"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Python
id: {{ b64enc "e2e-service-consumer" }}.1-{{ b64enc "provider-py"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/satellite/native-protocols/expected/dependency-services.yml b/test/e2e-v2/cases/satellite/native-protocols/expected/dependency-services.yml
index aa6e2fc5fd..f4adf59f95 100644
--- a/test/e2e-v2/cases/satellite/native-protocols/expected/dependency-services.yml
+++ b/test/e2e-v2/cases/satellite/native-protocols/expected/dependency-services.yml
@@ -27,9 +27,11 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "e2e-service-provider"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "e2e-service-consumer"}}.1-{{ b64enc "e2e-service-provider"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e-v2/cases/simple/expected/dependency-services-consumer.yml b/test/e2e-v2/cases/simple/expected/dependency-services-consumer.yml
index 11ba084ec2..106faf57a0 100644
--- a/test/e2e-v2/cases/simple/expected/dependency-services-consumer.yml
+++ b/test/e2e-v2/cases/simple/expected/dependency-services-consumer.yml
@@ -31,9 +31,11 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "e2e-service-provider"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "e2e-service-consumer"}}.1-{{ b64enc "e2e-service-provider"}}.1
detectpoints:
- CLIENT
@@ -41,7 +43,8 @@ calls:
- source: {{ b64enc "User" }}.0
sourcecomponents: []
target: {{ b64enc "e2e-service-consumer"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "User" }}.0-{{ b64enc "e2e-service-consumer"}}.1
detectpoints:
- SERVER
diff --git a/test/e2e-v2/cases/simple/expected/dependency-services-provider.yml b/test/e2e-v2/cases/simple/expected/dependency-services-provider.yml
index 600dd6dd99..6364697409 100644
--- a/test/e2e-v2/cases/simple/expected/dependency-services-provider.yml
+++ b/test/e2e-v2/cases/simple/expected/dependency-services-provider.yml
@@ -31,15 +31,18 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "e2e-service-provider"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "e2e-service-consumer"}}.1-{{ b64enc "e2e-service-provider"}}.1
detectpoints:
- CLIENT
- SERVER
- source: {{ b64enc "e2e-service-provider" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - h2-jdbc-driver
target: {{ b64enc "localhost:-1"}}.0
targetcomponents: []
id: {{ b64enc "e2e-service-provider" }}.1-{{ b64enc "localhost:-1"}}.0
diff --git a/test/e2e-v2/cases/storage/expected/dependency-services-consumer.yml b/test/e2e-v2/cases/storage/expected/dependency-services-consumer.yml
index 11ba084ec2..106faf57a0 100644
--- a/test/e2e-v2/cases/storage/expected/dependency-services-consumer.yml
+++ b/test/e2e-v2/cases/storage/expected/dependency-services-consumer.yml
@@ -31,9 +31,11 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "e2e-service-provider"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "e2e-service-consumer"}}.1-{{ b64enc "e2e-service-provider"}}.1
detectpoints:
- CLIENT
@@ -41,7 +43,8 @@ calls:
- source: {{ b64enc "User" }}.0
sourcecomponents: []
target: {{ b64enc "e2e-service-consumer"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "User" }}.0-{{ b64enc "e2e-service-consumer"}}.1
detectpoints:
- SERVER
diff --git a/test/e2e-v2/cases/storage/expected/dependency-services-provider.yml b/test/e2e-v2/cases/storage/expected/dependency-services-provider.yml
index 600dd6dd99..6364697409 100644
--- a/test/e2e-v2/cases/storage/expected/dependency-services-provider.yml
+++ b/test/e2e-v2/cases/storage/expected/dependency-services-provider.yml
@@ -31,15 +31,18 @@ nodes:
calls:
{{- contains .calls }}
- source: {{ b64enc "e2e-service-consumer"}}.1
- sourcecomponents: []
+ sourcecomponents:
+ - SpringRestTemplate
target: {{ b64enc "e2e-service-provider"}}.1
- targetcomponents: []
+ targetcomponents:
+ - Tomcat
id: {{ b64enc "e2e-service-consumer"}}.1-{{ b64enc "e2e-service-provider"}}.1
detectpoints:
- CLIENT
- SERVER
- source: {{ b64enc "e2e-service-provider" }}.1
- sourcecomponents: []
+ sourcecomponents:
+ - h2-jdbc-driver
target: {{ b64enc "localhost:-1"}}.0
targetcomponents: []
id: {{ b64enc "e2e-service-provider" }}.1-{{ b64enc "localhost:-1"}}.0
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index c019b39d73..506a9a6d7d 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -25,4 +25,4 @@ SW_KUBERNETES_COMMIT_SHA=b670c41d94a82ddefcf466d54bab5c492d88d772
SW_ROVER_COMMIT=fc8d074c6d34ecfee585a7097cbd5aef1ca680a5
SW_BANYANDB_COMMIT=adbd3e87df7f84e5d1904fcf40476d2e81842058
-SW_CTL_COMMIT=838e222da5ab81b383c5bc8526e5d30002d836f9
+SW_CTL_COMMIT=9aa1e75af41407a8b85106cc6bc711ab937f6fb5
\ No newline at end of file