You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2021/09/26 16:48:42 UTC
[GitHub] [skywalking] mrproliu opened a new pull request #7810: Support E2E testing satellite native protocols
mrproliu opened a new pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810
### #7368 , Start using `skywalking-infra-e2e` for e2e testing
- [ ] If this is non-trivial feature, paste the links/URLs to the design doc.
- [ ] Update the documentation to include this new feature.
- [x] Tests(including UT, IT, E2E) are added to verify the new feature.
- [ ] If it's UI related, attach the screenshots below.
- [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #<issue number>.
- [ ] Update the [`CHANGES` log](https://github.com/apache/skywalking/blob/master/CHANGES.md).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716349472
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
+ volumes:
+ - ./lal.yaml:/skywalking/config/lal/test.yaml
+ ports:
+ - 12800
+ depends_on:
+ etcd:
+ condition: service_healthy
+
+ satellite:
+ build:
+ context: ../
+ dockerfile: Dockerfile.satellite
+ expose:
+ - 11800
+ ports:
Review comment:
> Currently, the `skywalking-infra-e2e` using the `ports` attribute to expose all the ports(export to the environment). And the `ports` means exposed to the host machine. but the `expose` only mean not being exposed to host machines, only exposed to other services.
That's the point. You should only expose the ports that will be access in local machine to avoid port conflicts in local machine, I think only OAP 12800 is the case. Others like satellite, provider, consumer are all not accessed in local machine and should not be `ports`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716325818
##########
File path: test/e2e-v2/script/docker-compose/base-compose.yml
##########
@@ -0,0 +1,102 @@
+# 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.
+
+version: '2.1'
+
+services:
+ oap:
+ image: skywalking/oap:latest
+ expose:
+ - 11800
+ - 12800
+ - 10051
+ - 5005
+ networks:
+ - e2e
+ volumes:
+ - ./../prepare/setup-oap/download-mysql.sh:/download-mysql.sh
+ - ./../prepare/setup-oap/log4j2.xml:/skywalking/config/log4j2.xml
+ environment:
Review comment:
It's OK to set these here (as long as they are reasonable in our E2E), they serve as the default configurations in E2E cases, without modifying the original `application.yaml`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716342690
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
+ volumes:
+ - ./lal.yaml:/skywalking/config/lal/test.yaml
+ ports:
+ - 12800
+ depends_on:
+ etcd:
+ condition: service_healthy
+
+ satellite:
+ build:
+ context: ../
+ dockerfile: Dockerfile.satellite
+ expose:
+ - 11800
+ ports:
Review comment:
This is not needed, I think all the `ports` should be `expose`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716354577
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# 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.
+
+ARG SW_AGENT_JDK_VERSION=8
+ARG SW_AGENT_JAVA_COMMIT=1f3c08a5af19f8522f2a40d9339c45fa816bfe07
Review comment:
It helps for e2e testing locally, so I think we should not remove it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu merged pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu merged pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716280380
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,26 @@
+# 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.
+
+ARG SW_AGENT_JDK_VERSION=8
+
+FROM ghcr.io/apache/skywalking-java/jdk-${SW_AGENT_JDK_VERSION}:f19195368916e9514d19084eb1a29737c74bd25b
Review comment:
Let's move `f19195368916e9514d19084eb1a29737c74bd25b` to a system environment, controlling by GHA file. And we need to update commit tag to `3997f0256056788bd054ee37e4603c11c0fd6756`, which mean, Tomcat/SpringMVC's operation name should add HTTP method as prefix, see https://github.com/apache/skywalking-java/pull/37
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] sonatype-lift[bot] commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
sonatype-lift[bot] commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716238214
##########
File path: test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
##########
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ ~
+ -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>apache-skywalking-e2e</artifactId>
+ <groupId>org.apache.skywalking</groupId>
+ <version>2.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <packaging>jar</packaging>
+
+ <artifactId>e2e-service-provider</artifactId>
+
+ <properties>
+ <log4j.version>1.2.17</log4j.version>
+ <log4j2.version>2.7</log4j2.version>
+ <logback.version>1.2.3</logback.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.skywalking</groupId>
+ <artifactId>apm-toolkit-micrometer-registry</artifactId>
+ <version>8.2.0</version>
+ </dependency>
+ <dependency>
Review comment:
*Critical OSS Vulnerability:*
### pkg:maven/log4j/log4j@1.2.17
1 Critical, 0 Severe, 1 Moderate, 0 Unknown vulnerabilities have been found across 1 dependencies
<details>
<summary><b>Components</b></summary><br/>
<ul>
<details>
<summary><b>pkg:maven/log4j/log4j@1.2.17</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2019-17571] Included in Log4j 1.2 is a SocketServer class that is vulnerable to deserializat...
> Included in Log4j 1.2 is a SocketServer class that is vulnerable to deserialization of untrusted data which can be exploited to remotely execute arbitrary code when combined with a deserialization gadget when listening to untrusted network traffic for log data. This affects Log4j versions up to 1.2 up to 1.2.17.
>
> **CVSS Score:** 9.8
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H
</ul>
</details>
<details>
<summary><b>MODERATE Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2020-9488] Improper validation of certificate with host mismatch in Apache Log4j SMTP appen...
> Improper validation of certificate with host mismatch in Apache Log4j SMTP appender. This could allow an SMTPS connection to be intercepted by a man-in-the-middle attack which could leak any log messages sent through that appender.
>
> **CVSS Score:** 3.7
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:N/A:N
</ul>
</details>
</ul>
</details>
</ul>
</details>
(at-me [in a reply](https://help.sonatype.com/lift/talking-to-lift) with `help` or `ignore`)
##########
File path: test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
##########
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ ~
+ -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>apache-skywalking-e2e</artifactId>
+ <groupId>org.apache.skywalking</groupId>
+ <version>2.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <packaging>jar</packaging>
+
+ <artifactId>e2e-service-provider</artifactId>
+
+ <properties>
+ <log4j.version>1.2.17</log4j.version>
+ <log4j2.version>2.7</log4j2.version>
+ <logback.version>1.2.3</logback.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.skywalking</groupId>
+ <artifactId>apm-toolkit-micrometer-registry</artifactId>
+ <version>8.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
Review comment:
*Critical OSS Vulnerability:*
### pkg:maven/org.apache.logging.log4j/log4j-core@2.7
1 Critical, 0 Severe, 1 Moderate, 0 Unknown vulnerabilities have been found across 1 dependencies
<details>
<summary><b>Components</b></summary><br/>
<ul>
<details>
<summary><b>pkg:maven/org.apache.logging.log4j/log4j-core@2.7</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2017-5645] Deserialization of Untrusted Data
> In Apache Log4j 2.x before 2.8.2, when using the TCP socket server or UDP socket server to receive serialized log events from another application, a specially crafted binary payload can be sent that, when deserialized, can execute arbitrary code.
>
> **CVSS Score:** 9.8
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H
</ul>
</details>
<details>
<summary><b>MODERATE Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2020-9488] Improper validation of certificate with host mismatch in Apache Log4j SMTP appen...
> Improper validation of certificate with host mismatch in Apache Log4j SMTP appender. This could allow an SMTPS connection to be intercepted by a man-in-the-middle attack which could leak any log messages sent through that appender.
>
> **CVSS Score:** 3.7
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:H/PR:N/UI:N/S:U/C:L/I:N/A:N
</ul>
</details>
</ul>
</details>
</ul>
</details>
(at-me [in a reply](https://help.sonatype.com/lift/talking-to-lift) with `help` or `ignore`)
##########
File path: test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
##########
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ ~
+ -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>apache-skywalking-e2e</artifactId>
+ <groupId>org.apache.skywalking</groupId>
+ <version>2.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <packaging>jar</packaging>
+
+ <artifactId>e2e-service-provider</artifactId>
+
+ <properties>
+ <log4j.version>1.2.17</log4j.version>
+ <log4j2.version>2.7</log4j2.version>
+ <logback.version>1.2.3</logback.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
+ <dependency>
Review comment:
*Critical OSS Vulnerability:*
### pkg:maven/org.springframework.boot/spring-boot-starter-actuator@2.2.5.RELEASE
1 Critical, 0 Severe, 0 Moderate, 0 Unknown vulnerabilities have been found across 1 dependencies
<details>
<summary><b>Components</b></summary><br/>
<ul>
<details>
<summary><b>pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.10.2</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2020-25649] A flaw was found in FasterXML Jackson Databind, where it did not have entity exp...
> A flaw was found in FasterXML Jackson Databind, where it did not have entity expansion secured properly. This flaw allows vulnerability to XML external entity (XXE) attacks. The highest threat from this vulnerability is data integrity.
>
> **CVSS Score:** 7.5
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:H/A:N
</ul>
</details>
</ul>
</details>
</ul>
</details>
(at-me [in a reply](https://help.sonatype.com/lift/talking-to-lift) with `help` or `ignore`)
##########
File path: test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
##########
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ ~
+ -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>apache-skywalking-e2e</artifactId>
+ <groupId>org.apache.skywalking</groupId>
+ <version>2.0.0</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <packaging>jar</packaging>
+
+ <artifactId>e2e-service-provider</artifactId>
+
+ <properties>
+ <log4j.version>1.2.17</log4j.version>
+ <log4j2.version>2.7</log4j2.version>
+ <logback.version>1.2.3</logback.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
Review comment:
*Critical OSS Vulnerability:*
### pkg:maven/org.springframework.boot/spring-boot-starter-data-jpa@2.2.5.RELEASE
5 Critical, 0 Severe, 0 Moderate, 0 Unknown vulnerabilities have been found across 4 dependencies
<details>
<summary><b>Components</b></summary><br/>
<ul>
<details>
<summary><b>pkg:maven/org.springframework/spring-core@5.2.4.RELEASE</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (2)</b></summary><br/>
<ul>
<details>
<summary>CVE-2020-5421</summary>
> #### [CVE-2020-5421] In Spring Framework versions 5.2.0 - 5.2.8, 5.1.0 - 5.1.17, 5.0.0 - 5.0.18, 4.3....
> In Spring Framework versions 5.2.0 - 5.2.8, 5.1.0 - 5.1.17, 5.0.0 - 5.0.18, 4.3.0 - 4.3.28, and older unsupported versions, the protections against RFD attacks from CVE-2015-5211 may be bypassed depending on the browser used through the use of a jsessionid path parameter.
>
> **CVSS Score:** 8.8
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H
</details>
<details>
<summary>CVE-2021-22118</summary>
> #### [CVE-2021-22118] In Spring Framework, versions 5.2.x prior to 5.2.15 and versions 5.3.x prior to ...
> In Spring Framework, versions 5.2.x prior to 5.2.15 and versions 5.3.x prior to 5.3.7, a WebFlux application is vulnerable to a privilege escalation: by (re)creating the temporary storage directory, a locally authenticated malicious user can read or modify files that have been uploaded to the WebFlux application, or overwrite arbitrary files with multipart request data.
>
> **CVSS Score:** 7.8
>
> **CVSS Vector:** CVSS:3.0/AV:L/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H
</details>
</ul>
</details>
</ul>
</details>
<details>
<summary><b>pkg:maven/org.dom4j/dom4j@2.1.1</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2020-10683] dom4j before 2.0.3 and 2.1.x before 2.1.3 allows external DTDs and External Enti...
> dom4j before 2.0.3 and 2.1.x before 2.1.3 allows external DTDs and External Entities by default, which might enable XXE attacks. However, there is popular external documentation from OWASP showing how to enable the safe, non-default behavior in any application that uses dom4j.
>
> **CVSS Score:** 9.8
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H
</ul>
</details>
</ul>
</details>
<details>
<summary><b>pkg:maven/org.hibernate/hibernate-core@5.4.12.Final</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2020-25638] A flaw was found in hibernate-core in versions prior to and including 5.4.23.Fin...
> A flaw was found in hibernate-core in versions prior to and including 5.4.23.Final. A SQL injection in the implementation of the JPA Criteria API can permit unsanitized literals when a literal is used in the SQL comments of the query. This flaw could allow an attacker to access unauthorized information or possibly conduct further attacks. The highest threat from this vulnerability is to data confidentiality and integrity.
>
> **CVSS Score:** 7.4
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:H/A:N
</ul>
</details>
</ul>
</details>
<details>
<summary><b>pkg:maven/org.yaml/snakeyaml@1.25</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2017-18640] The Alias feature in SnakeYAML 1.18 allows entity expansion during a load operat...
> The Alias feature in SnakeYAML 1.18 allows entity expansion during a load operation, a related issue to CVE-2003-1564.
>
> **CVSS Score:** 7.5
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H
</ul>
</details>
</ul>
</details>
</ul>
</details>
(at-me [in a reply](https://help.sonatype.com/lift/talking-to-lift) with `help` or `ignore`)
##########
File path: test/e2e-v2/java-test-service/pom.xml
##########
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ ~
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.skywalking</groupId>
+ <artifactId>apache-skywalking-e2e</artifactId>
+ <version>2.0.0</version>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>e2e-service-provider</module>
+ <module>e2e-service-consumer</module>
+ </modules>
+
+ <properties>
+ <sw.version>8.7.0</sw.version>
+
+ <java.version>1.8</java.version>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <spring.boot.version>2.2.5.RELEASE</spring.boot.version>
+ <spring.cloud.version>2.1.2.RELEASE</spring.cloud.version>
+ <jupeter.version>5.6.0</jupeter.version>
+ <jackson.version>2.9.7</jackson.version>
+ <guava.version>30.1.1-jre</guava.version>
+ <h2.version>1.4.199</h2.version>
+ <mysql.version>8.0.13</mysql.version>
+ <lombok.version>1.18.20</lombok.version>
+ <kafka-clients.version>2.4.1</kafka-clients.version>
+
+ <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
+ <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+ <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+
+ <testcontainers.version>1.15.3</testcontainers.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/groups/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.2.5.RELEASE</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
Review comment:
*Critical OSS Vulnerability:*
### pkg:maven/org.springframework.boot/spring-boot-starter-test@2.2.5.RELEASE
1 Critical, 1 Severe, 0 Moderate, 0 Unknown vulnerabilities have been found across 2 dependencies
<details>
<summary><b>Components</b></summary><br/>
<ul>
<details>
<summary><b>pkg:maven/junit/junit@4.12</b></summary>
<ul>
<details>
<summary><b>SEVERE Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2020-15250] In JUnit4 from version 4.7 and before 4.13.1, the test rule TemporaryFolder cont...
> In JUnit4 from version 4.7 and before 4.13.1, the test rule TemporaryFolder contains a local information disclosure vulnerability. On Unix like systems, the system's temporary directory is shared between all users on that system. Because of this, when files and directories are written into this directory they are, by default, readable by other users on that same system. This vulnerability does not allow other users to overwrite the contents of these directories or files. This is purely an information disclosure vulnerability. This vulnerability impacts you if the JUnit tests write sensitive information, like API keys or passwords, into the temporary folder, and the JUnit tests execute in an environment where the OS has other untrusted users. Because certain JDK file system APIs were only added in JDK 1.7, this this fix is dependent upon the version of the JDK you are using. For Java 1.7 and higher users: this vulnerability is fixed in 4.13.1. For Java 1.6 and lower users: no
patch is available, you must use the workaround below. If you are unable to patch, or are stuck running on Java 1.6, specifying the `java.io.tmpdir` system environment variable to a directory that is exclusively owned by the executing user will fix this vulnerability. For more information, including an example of vulnerable code, see the referenced GitHub Security Advisory.
>
> **CVSS Score:** 5.5
>
> **CVSS Vector:** CVSS:3.0/AV:L/AC:L/PR:N/UI:R/S:U/C:H/I:N/A:N
</ul>
</details>
</ul>
</details>
<details>
<summary><b>pkg:maven/net.minidev/json-smart@2.3</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2021-27568] An issue was discovered in netplex json-smart-v1 through 2015-10-23 and json-sma...
> An issue was discovered in netplex json-smart-v1 through 2015-10-23 and json-smart-v2 through 2.4. An exception is thrown from a function, but it is not caught, as demonstrated by NumberFormatException. When it is not caught, it may cause programs using the library to crash or expose sensitive information.
>
> **CVSS Score:** 9.1
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:H
</ul>
</details>
</ul>
</details>
</ul>
</details>
(at-me [in a reply](https://help.sonatype.com/lift/talking-to-lift) with `help` or `ignore`)
##########
File path: test/e2e-v2/java-test-service/pom.xml
##########
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ ~
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.skywalking</groupId>
+ <artifactId>apache-skywalking-e2e</artifactId>
+ <version>2.0.0</version>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>e2e-service-provider</module>
+ <module>e2e-service-consumer</module>
+ </modules>
+
+ <properties>
+ <sw.version>8.7.0</sw.version>
+
+ <java.version>1.8</java.version>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <spring.boot.version>2.2.5.RELEASE</spring.boot.version>
+ <spring.cloud.version>2.1.2.RELEASE</spring.cloud.version>
+ <jupeter.version>5.6.0</jupeter.version>
+ <jackson.version>2.9.7</jackson.version>
+ <guava.version>30.1.1-jre</guava.version>
+ <h2.version>1.4.199</h2.version>
+ <mysql.version>8.0.13</mysql.version>
+ <lombok.version>1.18.20</lombok.version>
+ <kafka-clients.version>2.4.1</kafka-clients.version>
+
+ <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
+ <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+ <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+
+ <testcontainers.version>1.15.3</testcontainers.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/groups/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.2.5.RELEASE</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
Review comment:
*Critical OSS Vulnerability:*
### pkg:maven/org.springframework.boot/spring-boot-starter-web@2.2.5.RELEASE
10 Critical, 3 Severe, 0 Moderate, 0 Unknown vulnerabilities have been found across 3 dependencies
<details>
<summary><b>Components</b></summary><br/>
<ul>
<details>
<summary><b>pkg:maven/org.springframework/spring-web@5.2.4.RELEASE</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2020-5421] In Spring Framework versions 5.2.0 - 5.2.8, 5.1.0 - 5.1.17, 5.0.0 - 5.0.18, 4.3....
> In Spring Framework versions 5.2.0 - 5.2.8, 5.1.0 - 5.1.17, 5.0.0 - 5.0.18, 4.3.0 - 4.3.28, and older unsupported versions, the protections against RFD attacks from CVE-2015-5211 may be bypassed depending on the browser used through the use of a jsessionid path parameter.
>
> **CVSS Score:** 8.8
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H
</ul>
</details>
</ul>
</details>
<details>
<summary><b>pkg:maven/org.apache.tomcat.embed/tomcat-embed-core@9.0.31</b></summary>
<ul>
<details>
<summary><b>CRITICAL Vulnerabilities (9)</b></summary><br/>
<ul>
<details>
<summary>CVE-2021-30640</summary>
> #### [CVE-2021-30640] A vulnerability in the JNDI Realm of Apache Tomcat allows an attacker to authent...
> A vulnerability in the JNDI Realm of Apache Tomcat allows an attacker to authenticate using variations of a valid user name and/or to bypass some of the protection provided by the LockOut Realm. This issue affects Apache Tomcat 10.0.0-M1 to 10.0.5; 9.0.0.M1 to 9.0.45; 8.5.0 to 8.5.65.
>
> **CVSS Score:** 8.2
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:L/I:H/A:N
</details>
<details>
<summary>CVE-2020-13935</summary>
> #### [CVE-2020-13935] The payload length in a WebSocket frame was not correctly validated in Apache To...
> The payload length in a WebSocket frame was not correctly validated in Apache Tomcat 10.0.0-M1 to 10.0.0-M6, 9.0.0.M1 to 9.0.36, 8.5.0 to 8.5.56 and 7.0.27 to 7.0.104. Invalid payload lengths could trigger an infinite loop. Multiple requests with invalid payload lengths could lead to a denial of service.
>
> **CVSS Score:** 7.5
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H
</details>
<details>
<summary>CVE-2020-13934</summary>
> #### [CVE-2020-13934] An h2c direct connection to Apache Tomcat 10.0.0-M1 to 10.0.0-M6, 9.0.0.M5 to 9....
> An h2c direct connection to Apache Tomcat 10.0.0-M1 to 10.0.0-M6, 9.0.0.M5 to 9.0.36 and 8.5.1 to 8.5.56 did not release the HTTP/1.1 processor after the upgrade to HTTP/2. If a sufficient number of such requests were made, an OutOfMemoryException could occur leading to a denial of service.
>
> **CVSS Score:** 7.5
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H
</details>
<details>
<summary>CVE-2020-17527</summary>
> #### [CVE-2020-17527] While investigating bug 64830 it was discovered that Apache Tomcat 10.0.0-M1 to ...
> While investigating bug 64830 it was discovered that Apache Tomcat 10.0.0-M1 to 10.0.0-M9, 9.0.0-M1 to 9.0.39 and 8.5.0 to 8.5.59 could re-use an HTTP request header value from the previous stream received on an HTTP/2 connection for the request associated with the subsequent stream. While this would most likely lead to an error and the closure of the HTTP/2 connection, it is possible that information could leak between requests.
>
> **CVSS Score:** 7.5
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:N
</details>
<details>
<summary>CVE-2020-11996</summary>
> #### [CVE-2020-11996] A specially crafted sequence of HTTP/2 requests sent to Apache Tomcat 10.0.0-M1 ...
> A specially crafted sequence of HTTP/2 requests sent to Apache Tomcat 10.0.0-M1 to 10.0.0-M5, 9.0.0.M1 to 9.0.35 and 8.5.0 to 8.5.55 could trigger high CPU usage for several seconds. If a sufficient number of such requests were made on concurrent HTTP/2 connections, the server could become unresponsive.
>
> **CVSS Score:** 7.5
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H
</details>
<details>
<summary>CVE-2021-25122</summary>
> #### [CVE-2021-25122] When responding to new h2c connection requests, Apache Tomcat versions 10.0.0-M1...
> When responding to new h2c connection requests, Apache Tomcat versions 10.0.0-M1 to 10.0.0, 9.0.0.M1 to 9.0.41 and 8.5.0 to 8.5.61 could duplicate request headers and a limited amount of request body from one request to another meaning user A and user B could both see the results of user A's request.
>
> **CVSS Score:** 7.5
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:N
</details>
<details>
<summary>CVE-2021-24122</summary>
> #### [CVE-2021-24122] When serving resources from a network location using the NTFS file system, Apach...
> When serving resources from a network location using the NTFS file system, Apache Tomcat versions 10.0.0-M1 to 10.0.0-M9, 9.0.0.M1 to 9.0.39, 8.5.0 to 8.5.59 and 7.0.0 to 7.0.106 were susceptible to JSP source code disclosure in some configurations. The root cause was the unexpected behaviour of the JRE API File.getCanonicalPath() which in turn was caused by the inconsistent behaviour of the Windows API (FindFirstFileW) in some circumstances.
>
> **CVSS Score:** 7.5
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:N
</details>
<details>
<summary>CVE-2020-9484</summary>
> #### [CVE-2020-9484] When using Apache Tomcat versions 10.0.0-M1 to 10.0.0-M4, 9.0.0.M1 to 9.0.34, 8....
> When using Apache Tomcat versions 10.0.0-M1 to 10.0.0-M4, 9.0.0.M1 to 9.0.34, 8.5.0 to 8.5.54 and 7.0.0 to 7.0.103 if a) an attacker is able to control the contents and name of a file on the server; and b) the server is configured to use the PersistenceManager with a FileStore; and c) the PersistenceManager is configured with sessionAttributeValueClassNameFilter="null" (the default unless a SecurityManager is used) or a sufficiently lax filter to allow the attacker provided object to be deserialized; and d) the attacker knows the relative file path from the storage location used by FileStore to the file the attacker has control over; then, using a specifically crafted request, the attacker will be able to trigger remote code execution via deserialization of the file under their control. Note that all of conditions a) to d) must be true for the attack to succeed.
>
> **CVSS Score:** 7
>
> **CVSS Vector:** CVSS:3.0/AV:L/AC:H/PR:L/UI:N/S:U/C:H/I:H/A:H
</details>
<details>
<summary>CVE-2021-25329</summary>
> #### [CVE-2021-25329] The fix for CVE-2020-9484 was incomplete. When using Apache Tomcat 10.0.0-M1 to ...
> The fix for CVE-2020-9484 was incomplete. When using Apache Tomcat 10.0.0-M1 to 10.0.0, 9.0.0.M1 to 9.0.41, 8.5.0 to 8.5.61 or 7.0.0. to 7.0.107 with a configuration edge case that was highly unlikely to be used, the Tomcat instance was still vulnerable to CVE-2020-9494. Note that both the previously published prerequisites for CVE-2020-9484 and the previously published mitigations for CVE-2020-9484 also apply to this issue.
>
> **CVSS Score:** 7
>
> **CVSS Vector:** CVSS:3.0/AV:L/AC:H/PR:L/UI:N/S:U/C:H/I:H/A:H
</details>
</ul>
</details>
<details>
<summary><b>SEVERE Vulnerabilities (2)</b></summary><br/>
<ul>
<details>
<summary>CVE-2021-33037</summary>
> #### [CVE-2021-33037] Apache Tomcat 10.0.0-M1 to 10.0.6, 9.0.0.M1 to 9.0.46 and 8.5.0 to 8.5.66 did no...
> Apache Tomcat 10.0.0-M1 to 10.0.6, 9.0.0.M1 to 9.0.46 and 8.5.0 to 8.5.66 did not correctly parse the HTTP transfer-encoding request header in some circumstances leading to the possibility to request smuggling when used with a reverse proxy. Specifically: - Tomcat incorrectly ignored the transfer encoding header if the client declared it would only accept an HTTP/1.0 response; - Tomcat honoured the identify encoding; and - Tomcat did not ensure that, if present, the chunked encoding was the final encoding.
>
> **CVSS Score:** 5.3
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:L/A:N
</details>
<details>
<summary>CVE-2020-13943</summary>
> #### [CVE-2020-13943] If an HTTP/2 client connecting to Apache Tomcat 10.0.0-M1 to 10.0.0-M7, 9.0.0.M1...
> If an HTTP/2 client connecting to Apache Tomcat 10.0.0-M1 to 10.0.0-M7, 9.0.0.M1 to 9.0.37 or 8.5.0 to 8.5.57 exceeded the agreed maximum number of concurrent streams for a connection (in violation of the HTTP/2 protocol), it was possible that a subsequent request made on that connection could contain HTTP headers - including HTTP/2 pseudo headers - from a previous request rather than the intended headers. This could lead to users seeing responses for unexpected resources.
>
> **CVSS Score:** 4.3
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:L/UI:N/S:U/C:L/I:N/A:N
</details>
</ul>
</details>
</ul>
</details>
<details>
<summary><b>pkg:maven/org.hibernate.validator/hibernate-validator@6.0.18.Final</b></summary>
<ul>
<details>
<summary><b>SEVERE Vulnerabilities (1)</b></summary><br/>
<ul>
> #### [CVE-2020-10693] A flaw was found in Hibernate Validator version 6.1.2.Final. A bug in the messag...
> A flaw was found in Hibernate Validator version 6.1.2.Final. A bug in the message interpolation processor enables invalid EL expressions to be evaluated as if they were valid. This flaw allows attackers to bypass input sanitation (escaping, stripping) controls that developers may have put in place when handling user-controlled data in error messages.
>
> **CVSS Score:** 5.3
>
> **CVSS Vector:** CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:L/A:N
</ul>
</details>
</ul>
</details>
</ul>
</details>
(at-me [in a reply](https://help.sonatype.com/lift/talking-to-lift) with `help` or `ignore`)
##########
File path: test/e2e-v2/script/prepare/setup-oap/download-mysql.sh
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
*ShellCheck:* Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.
(at-me [in a reply](https://help.sonatype.com/lift/talking-to-lift) with `help` or `ignore`)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#issuecomment-927505571
One more, please add check for `service dependency`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716342690
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
+ volumes:
+ - ./lal.yaml:/skywalking/config/lal/test.yaml
+ ports:
+ - 12800
+ depends_on:
+ etcd:
+ condition: service_healthy
+
+ satellite:
+ build:
+ context: ../
+ dockerfile: Dockerfile.satellite
+ expose:
+ - 11800
+ ports:
Review comment:
This is not needed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716353095
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
I think we can now directly use the agent image and mount the service jar in docker compose file, so we can only change that single file if we want to update the agent image
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716359892
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
If you only want to update the agent image in one place, please take a look, It have been define in the GHA file: https://github.com/apache/skywalking/pull/7810/files#diff-29a4ad0b26179d51ca486039a03d45f783f02a5906e198292001358a29673c2fR44-R45
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716365585
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
> If you only want to update the agent image in one place, please take a look, It have been define in the GHA file: https://github.com/apache/skywalking/pull/7810/files#diff-29a4ad0b26179d51ca486039a03d45f783f02a5906e198292001358a29673c2fR44-R45
What I want is update it in one place, and take effect both locally and in GHA.
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
The current codes will make it different in local tests and in GHA. If we update the GHA env var and forgot to update the default value.
##########
File path: test/e2e-v2/cases/satellite/native-protocols/expected/dependency-services.yml
##########
@@ -0,0 +1,58 @@
+# 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.
+
+nodes:
+{{- range .nodes }}
+{{- if eq .name "User" }}
+- id: VXNlcg==.0
Review comment:
Use `{{ b64 "User }}.0` for better readability and maintainability, the same for other places in the expected files
##########
File path: test/e2e-v2/cases/satellite/native-protocols/expected/dependency-services.yml
##########
@@ -0,0 +1,58 @@
+# 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.
+
+nodes:
+{{- range .nodes }}
+{{- if eq .name "User" }}
+- id: VXNlcg==.0
Review comment:
Use `{{ b64 "User" }}.0` for better readability and maintainability, the same for other places in the expected files
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
> But for the satellite, we also need to use the dockerfile to define it. because we need to using `nc` to check health. The satellite is using scratch as the base image.
The `ARG` can also be specified in `docker-compose.yaml` file. What you need to do is just remove the default value in `Dockerfile.satellite` and set it in `docker-compose.yaml`, so we can manage all versions in the `docker-compose.yaml`
```yaml
satellite:
build:
context: ../
dockerfile: Dockerfile.satellite
args:
- SW_AGENT_SATELLITE_COMMIT=${SW_AGENT_SATELLITE_COMMIT}
```
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
@mrproliu OK, then please create a single file to manage the versions. Maybe we can just export the versions in `setup` steps ?
P.S. I think we need to support the `.env` file feature in infra-e2e, which seems to be a more standard means in docker-compose to customize the variables.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716334554
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
Review comment:
I know we could. My point is, are we testing or plan to test?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716361889
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# 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.
+
+ARG SW_AGENT_JDK_VERSION=8
+ARG SW_AGENT_JAVA_COMMIT=1f3c08a5af19f8522f2a40d9339c45fa816bfe07
Review comment:
OK, then, I just feel this will be forgotten to update with time.
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
Could we move all version information into an initiative script? Neither GHA nor docker are not controlling it?
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
One file managing all test related 3rd party resources are what I expect.
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
I am not good about bash, @kezhenxu94 any suggestion?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716342607
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# 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.
+
+ARG SW_AGENT_JDK_VERSION=8
+ARG SW_AGENT_JAVA_COMMIT=1f3c08a5af19f8522f2a40d9339c45fa816bfe07
Review comment:
Miss change?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716333704
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,26 @@
+# 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.
+
+ARG SW_AGENT_JDK_VERSION=8
+
+FROM ghcr.io/apache/skywalking-java/jdk-${SW_AGENT_JDK_VERSION}:f19195368916e9514d19084eb1a29737c74bd25b
Review comment:
Change to using system environment to management, please check: https://github.com/apache/skywalking/pull/7810/files#diff-29a4ad0b26179d51ca486039a03d45f783f02a5906e198292001358a29673c2fR40-R45
E2E cases have been fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716343890
##########
File path: test/e2e-v2/script/prepare/setup-oap/download-mysql.sh
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
It’s better to add a shebang here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716349472
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
+ volumes:
+ - ./lal.yaml:/skywalking/config/lal/test.yaml
+ ports:
+ - 12800
+ depends_on:
+ etcd:
+ condition: service_healthy
+
+ satellite:
+ build:
+ context: ../
+ dockerfile: Dockerfile.satellite
+ expose:
+ - 11800
+ ports:
Review comment:
> Currently, the `skywalking-infra-e2e` using the `ports` attribute to expose all the ports(export to the environment). And the `ports` means exposed to the host machine. but the `expose` only mean not being exposed to host machines, only exposed to other services.
That's the point. You should only expose the ports that will be access in local machine to avoid port conflicts in local machine, I think only OAP 12800 is the case. Others like satellite, provider are all not accessed in local machine and should not be `ports`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716333779
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
Review comment:
Do we need this? Is DCS tested?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#issuecomment-927556533
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wankai123 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wankai123 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716299511
##########
File path: test/e2e-v2/script/docker-compose/base-compose.yml
##########
@@ -0,0 +1,102 @@
+# 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.
+
+version: '2.1'
+
+services:
+ oap:
+ image: skywalking/oap:latest
+ expose:
+ - 11800
+ - 12800
+ - 10051
+ - 5005
+ networks:
+ - e2e
+ volumes:
+ - ./../prepare/setup-oap/download-mysql.sh:/download-mysql.sh
+ - ./../prepare/setup-oap/log4j2.xml:/skywalking/config/log4j2.xml
+ environment:
Review comment:
should we set the mysql and these environment variables in base-comose?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716296604
##########
File path: test/e2e-v2/cases/satellite/Dockerfile.satellite
##########
@@ -0,0 +1,36 @@
+# 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.
+
+FROM golang:1.14 AS builder
+
+ARG COMMIT_HASH=6292e2fa41305202283587a7d570c1bc54c23c11
+ARG SATELLITE_CODE=${COMMIT_HASH}.tar.gz
+ARG SATELLITE_CODE_URL=https://github.com/apache/skywalking-satellite/archive/${SATELLITE_CODE}
Review comment:
I think we can build satellite dev image directly in GitHub. Don't need to cost time in main repo CI process.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716342888
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# 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.
+
+ARG SW_AGENT_JDK_VERSION=8
+ARG SW_AGENT_JAVA_COMMIT=1f3c08a5af19f8522f2a40d9339c45fa816bfe07
Review comment:
Could we remove the default value and use GHA env variable only?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716334075
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
Review comment:
yes. DCS needs to using the `etcd` as a configuration center, so we could dynamic change configuration.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716342030
##########
File path: .github/actions/infra-e2e-test/action.yml
##########
@@ -0,0 +1,67 @@
+#
+# 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.
+#
+name: 'Run Infra E2E Test'
+description: 'Common steps when running an E2E Test'
+inputs:
+ config_file:
+ description: 'The e2e test config file path'
+ required: true
+runs:
+ using: "composite"
+ steps:
+ - name: Cache local Maven repository
+ uses: actions/cache@v2
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - name: Check License
+ uses: apache/skywalking-eyes@a63f4afcc287dfb3727ecc45a4afc55a5e69c15f
+ - name: Setup E2E env
+ shell: bash
+ run: |
+ function export_env() {
+ echo "$1=$2" >> $GITHUB_ENV
+ }
+
+ export_env SW_AGENT_JAVA_COMMIT 3997f0256056788bd054ee37e4603c11c0fd6756
+ export_env SW_AGENT_SATELLITE_COMMIT 1f3c08a5af19f8522f2a40d9339c45fa816bfe07
+ - name: Build Docker Image
+ shell: bash
+ env:
+ SKIP_TEST: "true"
+ run: |
+ echo "::group::Build Docker Image"
+ # Retry one more time due to frequent "maven connection reset"
+ make docker || make docker
+ echo "::endgroup::"
+ - name: Build Java Test Services
+ shell: bash
+ env:
+ SKIP_TEST: "true"
Review comment:
Remove this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716324000
##########
File path: test/e2e-v2/script/docker-compose/base-compose.yml
##########
@@ -0,0 +1,102 @@
+# 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.
+
+version: '2.1'
+
+services:
+ oap:
+ image: skywalking/oap:latest
+ expose:
+ - 11800
+ - 12800
+ - 10051
+ - 5005
+ networks:
+ - e2e
+ volumes:
+ - ./../prepare/setup-oap/download-mysql.sh:/download-mysql.sh
+ - ./../prepare/setup-oap/log4j2.xml:/skywalking/config/log4j2.xml
+ environment:
Review comment:
Other e2e tests may need to use this configuration and use it in conjunction with the service in base-compose, so I think it’s better to put it there.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716326393
##########
File path: test/e2e-v2/script/docker-compose/base-compose.yml
##########
@@ -0,0 +1,102 @@
+# 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.
+
+version: '2.1'
+
+services:
+ oap:
+ image: skywalking/oap:latest
+ expose:
+ - 11800
+ - 12800
+ - 10051
+ - 5005
+ networks:
+ - e2e
+ volumes:
+ - ./../prepare/setup-oap/download-mysql.sh:/download-mysql.sh
+ - ./../prepare/setup-oap/log4j2.xml:/skywalking/config/log4j2.xml
+ environment:
Review comment:
@wankai123 I am a little confused about your asking. What setup? JDBC connection URL?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716348556
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
+ volumes:
+ - ./lal.yaml:/skywalking/config/lal/test.yaml
+ ports:
+ - 12800
+ depends_on:
+ etcd:
+ condition: service_healthy
+
+ satellite:
+ build:
+ context: ../
+ dockerfile: Dockerfile.satellite
+ expose:
+ - 11800
+ ports:
Review comment:
Currently, the `skywalking-infra-e2e` using the `ports` attribute to expose all the ports(export to the environment). And the `ports` means exposed to the host machine. but the `expose` only mean not being exposed to host machines, only exposed to other services.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng edited a comment on pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng edited a comment on pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#issuecomment-927573163
> https://gitbox.apache.org/setup/ is down now.
Infra PagerDuty reported. Let's skip this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716368041
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
Ok, It makes sense. I will remove this docker file and declare it in the docker-compose file.
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
But for the satellite, we also need to use the dockerfile to define it. because we need to using `nc` to check health. The satellite is using scratch as the base image.
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
Yes, we could. But I think this script need to export all environment as a local file(because the environment has scope), GHA and locally using `source` to import them.
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
+ volumes:
+ - ./lal.yaml:/skywalking/config/lal/test.yaml
+ ports:
+ - 12800
+ depends_on:
+ etcd:
+ condition: service_healthy
+
+ satellite:
+ build:
+ context: ../
+ dockerfile: Dockerfile.satellite
+ expose:
+ - 11800
+ ports:
Review comment:
Remove the satellite `ports` defines. `etcd`, `provider`, `consumer` and `oap` services need to be exposed to the local machine, so they need `ports` defines.
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
Yes, It's like this now. but we have multiple docker-compose files, some in the base-compose, some in the other docker-compose file. So we need someplace to put all the config as one file.
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
Review comment:
> @mrproliu OK, then please create a single file to manage the versions. Maybe we can just export the versions in `setup` steps ?
Currently, the `setup.step` is running after the compose setup is finished. Also, we need to make sure the environment in `.env` is available when the compose setup(there also have scope issue, but it could be resolved).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716345457
##########
File path: test/e2e-v2/java-test-service/Dockerfile.consumer
##########
@@ -0,0 +1,27 @@
+# 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.
+
+ARG SW_AGENT_JDK_VERSION=8
+ARG SW_AGENT_JAVA_COMMIT=1f3c08a5af19f8522f2a40d9339c45fa816bfe07
Review comment:
Bear in mind the tests will be run locally, only depending on GHA env var requires requires extra settings when running locally
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716334040
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
Review comment:
You are running oap in cluster mode(etcd), but there is only one oap instance. Please confirm which mode do you prefer?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716341590
##########
File path: .github/actions/infra-e2e-test/action.yml
##########
@@ -0,0 +1,67 @@
+#
+# 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.
+#
+name: 'Run Infra E2E Test'
+description: 'Common steps when running an E2E Test'
+inputs:
+ config_file:
Review comment:
Prefer using `config-file`, other GitHub actions (GitHub official or ours) are all using this style.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716335046
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
Review comment:
Already tested in the current E2E: https://github.com/apache/skywalking/pull/7810/files#diff-2f3202bcc00007e2e6d378ab341012e8e6ae6a79e920e9f9acdc3cee60546728R113-R123
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mrproliu commented on pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
mrproliu commented on pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#issuecomment-927562093
> Besides tag management, this should be almost ready, right?
> Consider to merge this if so. Then @wankai123 or others could begin to help migranting cases.
> Once we have resolution about tag management, we can do another update.
I think it's almost ready, could merge first.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #7810: Support E2E testing satellite native protocols
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #7810:
URL: https://github.com/apache/skywalking/pull/7810#discussion_r716349472
##########
File path: test/e2e-v2/cases/satellite/native-protocols/docker-compose.yml
##########
@@ -0,0 +1,111 @@
+# 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.
+
+version: '2.1'
+
+services:
+
+ etcd:
+ hostname: etcd
+ image: quay.io/coreos/etcd:v3.5.0
+ ports:
+ - 2379
+ networks:
+ - e2e
+ environment:
+ ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+ ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_ADVERTISE_PEER_URLS: http://0.0.0.0:2380
+ ETCD_INITIAL_CLUSTER: s1=http://0.0.0.0:2380
+ ETCD_NAME: s1
+ ETCD_DATA_DIR: /etcd-data
+ healthcheck:
+ test: ["CMD", "sh", "-c", "etcdctl endpoint health" ]
+ interval: 5s
+ timeout: 60s
+ retries: 120
+
+ oap:
+ extends:
+ file: ../../../script/docker-compose/base-compose.yml
+ service: oap
+ environment:
+ SW_LOG_LAL_FILES: test
+ SW_CLUSTER: etcd
+ SW_METER_ANALYZER_ACTIVE_FILES: spring-sleuth
+ SW_CONFIGURATION: etcd
+ volumes:
+ - ./lal.yaml:/skywalking/config/lal/test.yaml
+ ports:
+ - 12800
+ depends_on:
+ etcd:
+ condition: service_healthy
+
+ satellite:
+ build:
+ context: ../
+ dockerfile: Dockerfile.satellite
+ expose:
+ - 11800
+ ports:
Review comment:
> Currently, the `skywalking-infra-e2e` using the `ports` attribute to expose all the ports(export to the environment). And the `ports` means exposed to the host machine. but the `expose` only mean not being exposed to host machines, only exposed to other services.
That's the point. You should only expose the ports that will be access in local machine to avoid port conflicts in local machine, I think only OAP 12800 and consumer service need to be exposed. Others like satellite, provider are all not accessed in local machine and should not be `ports`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org