diff --git a/.github/workflows/ci-it.yaml b/.github/workflows/ci-it.yaml index 667fd83b9b97..a407ab7eb1d3 100644 --- a/.github/workflows/ci-it.yaml +++ b/.github/workflows/ci-it.yaml @@ -23,17 +23,17 @@ on: - master tags: - 'v*' - + +env: + MAVEN_OPTS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit + CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: CI: runs-on: ubuntu-18.04 timeout-minutes: 90 - strategy: - fail-fast: true steps: - uses: actions/checkout@v2 - # In the checkout@v2, it doesn't support git submodule. Execute the commands manually. - name: checkout submodules shell: bash run: | @@ -44,20 +44,16 @@ jobs: java-version: 8 - name: 'Install & Test' run: | - export MAVEN_OPTS='-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g' ./mvnw --batch-mode -P"agent,backend,ui,dist,CI-with-IT" clean cobertura:cobertura verify install javadoc:javadoc - CODECOV_TOKEN="d2065307-8f01-4637-9715-2781ef096db7" bash <(curl -s https://codecov.io/bash) + bash <(curl -s https://codecov.io/bash) - name: 'Check Dependencies Licenses' run: tools/dependencies/check-LICENSE.sh CI-on-Windows: - runs-on: Windows-latest + runs-on: windows-latest timeout-minutes: 90 - strategy: - fail-fast: true steps: - uses: actions/checkout@v2 - # In the checkout@v2, it doesn't support git submodule. Execute the commands manually. - name: checkout submodules shell: bash run: | @@ -67,19 +63,14 @@ jobs: with: java-version: 8 - name: 'Install & Test' - run: | - set MAVEN_OPTS='-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g' - ./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install + run: ./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install CI-on-MacOS: runs-on: macos-latest timeout-minutes: 90 - strategy: - fail-fast: true steps: - uses: actions/checkout@v2 - # In the checkout@v2, it doesn't support git submodule. Execute the commands manually. - name: checkout submodules shell: bash run: | @@ -89,6 +80,4 @@ jobs: with: java-version: 8 - name: 'Install & Test' - run: | - export MAVEN_OPTS='-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g' - ./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install + run: ./mvnw --batch-mode -P"agent,backend,ui,dist" clean verify install diff --git a/.github/workflows/e2e.cluster.yaml b/.github/workflows/e2e.cluster.yaml index 6b87a833c93e..b1eb89f5c6ed 100644 --- a/.github/workflows/e2e.cluster.yaml +++ b/.github/workflows/e2e.cluster.yaml @@ -26,6 +26,8 @@ on: env: SKIP_TEST: true + SW_AGENT_JDK_VERSION: 8 + CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: CoordinatorsStorage: @@ -52,6 +54,8 @@ jobs: run: cp -R dist test/e2e/ - name: Cluster with ${{ matrix.coordinator }} and ${{ matrix.storage }} run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.ClusterE2E + - name: Report Coverage + run: bash -x tools/coverage/report.sh - uses: actions/upload-artifact@v1 if: failure() with: @@ -64,4 +68,4 @@ jobs: needs: [CoordinatorsStorage] steps: - name: Call me by your name - run: echo "Birds of a feather flock together" \ No newline at end of file + run: echo "Birds of a feather flock together" diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml index c96e0a4d8556..4eb5be5db6fb 100644 --- a/.github/workflows/e2e.jdk-versions.yaml +++ b/.github/workflows/e2e.jdk-versions.yaml @@ -26,6 +26,7 @@ on: env: SKIP_TEST: true + CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: JavaVersions: @@ -51,6 +52,8 @@ jobs: run: cp -R dist test/e2e/ - name: Agent on JDK Version ${{ matrix.jdk }} run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.simple.SimpleE2E + - name: Report Coverage + run: bash -x tools/coverage/report.sh - uses: actions/upload-artifact@v1 if: failure() with: @@ -63,4 +66,4 @@ jobs: needs: [JavaVersions] steps: - name: Singles Bar - run: echo "Singles Bar - Miyuki Nakajima" \ No newline at end of file + run: echo "Singles Bar - Miyuki Nakajima" diff --git a/.github/workflows/e2e.profiling.yaml b/.github/workflows/e2e.profiling.yaml index 714fcc360c04..04de1767d1a1 100644 --- a/.github/workflows/e2e.profiling.yaml +++ b/.github/workflows/e2e.profiling.yaml @@ -26,6 +26,8 @@ on: env: SKIP_TEST: true + SW_AGENT_JDK_VERSION: 8 + CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: Profiling: @@ -50,7 +52,8 @@ jobs: run: cp -R dist test/e2e/ - name: Profiling ${{ matrix.storage }} run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.profile.ProfileE2E - + - name: Report Coverage + run: bash -x tools/coverage/report.sh - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index 5d9abf40f9b9..c346f4d0ddca 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -26,6 +26,8 @@ on: env: SKIP_TEST: true + SW_AGENT_JDK_VERSION: 8 + CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: StoragePlugins: @@ -50,6 +52,8 @@ jobs: run: cp -R dist test/e2e/ - name: Storage ${{ matrix.storage }} run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.storage.StorageE2E + - name: Report Coverage + run: bash -x tools/coverage/report.sh - uses: actions/upload-artifact@v1 if: failure() with: @@ -62,4 +66,4 @@ jobs: needs: [StoragePlugins] steps: - name: To pass or not pass - run: echo "Just to make the GitHub merge button green" \ No newline at end of file + run: echo "Just to make the GitHub merge button green" diff --git a/.github/workflows/e2e.ttl.yaml b/.github/workflows/e2e.ttl.yaml index 3f0912147616..8bce3fac6cef 100644 --- a/.github/workflows/e2e.ttl.yaml +++ b/.github/workflows/e2e.ttl.yaml @@ -26,6 +26,8 @@ on: env: SKIP_TEST: true + SW_AGENT_JDK_VERSION: 8 + CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: TTL: @@ -50,8 +52,10 @@ jobs: run: cp -R dist test/e2e/ - name: TTL of storage ${{ matrix.storage }} run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.ttl.StorageTTLE2E + - name: Report Coverage + run: bash -x tools/coverage/report.sh - uses: actions/upload-artifact@v1 if: failure() with: name: logs - path: logs \ No newline at end of file + path: logs diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 867db1e69e47..82213fe513a2 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -27,6 +27,7 @@ on: env: SKIP_TEST: true SW_AGENT_JDK_VERSION: 8 + CODECOV_TOKEN: d2065307-8f01-4637-9715-2781ef096db7 jobs: FeatureGroup01: @@ -51,6 +52,8 @@ jobs: run: cp -R dist test/e2e/ - name: ${{ matrix.case }} run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.simple.SimpleE2E + - name: Report Coverage + run: bash -x tools/coverage/report.sh - uses: actions/upload-artifact@v1 if: failure() with: @@ -74,6 +77,8 @@ jobs: run: cp -R dist test/e2e/ - name: Nginx Lua run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.LuaE2E + - name: Report Coverage + run: bash -x tools/coverage/report.sh - uses: actions/upload-artifact@v1 if: failure() with: @@ -97,6 +102,8 @@ jobs: run: cp -R dist test/e2e/ - name: Uninstrumnented gateway run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.GatewayE2E + - name: Report Coverage + run: bash -x tools/coverage/report.sh - uses: actions/upload-artifact@v1 if: failure() with: diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml index 80a27888c782..e24f7ec44260 100644 --- a/.github/workflows/plugins-test.0.yaml +++ b/.github/workflows/plugins-test.0.yaml @@ -18,21 +18,11 @@ name: PluginsTest on: pull_request: - paths: - - '.github/workflows/plugins-test*.yaml' - - 'apm-application-toolkit/**' - - 'apm-commons/**' - - 'apm-protocol/**' - - 'apm-sniffer/**' - - 'test/plugin/**' - - '**/pom.xml' - - '!test/e2e/**' - - '!apm-webapp/**' - - '!apm-dist/**' - - '!apm-dist-es7/**' - - '!apm-docker/**' - - '!docs/**' - - '!oap-server/**' + push: + branches: + - master + tags: + - 'v*' jobs: PluginsTest: @@ -80,3 +70,5 @@ jobs: run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests docker:build -DBUILD_NO=local - name: ${{ matrix.case.title }} run: bash test/plugin/run.sh ${{ matrix.case.name }} + - name: Report Coverage + run: bash -x tools/coverage/report.sh diff --git a/.github/workflows/plugins-test.1.yaml b/.github/workflows/plugins-test.1.yaml index d6d5061edc5e..b9fc6c20a7d5 100644 --- a/.github/workflows/plugins-test.1.yaml +++ b/.github/workflows/plugins-test.1.yaml @@ -18,21 +18,11 @@ name: PluginsTest on: pull_request: - paths: - - '.github/workflows/plugins-test*.yaml' - - 'apm-application-toolkit/**' - - 'apm-commons/**' - - 'apm-protocol/**' - - 'apm-sniffer/**' - - 'test/plugin/**' - - '**/pom.xml' - - '!test/e2e/**' - - '!apm-webapp/**' - - '!apm-dist/**' - - '!apm-dist-es7/**' - - '!apm-docker/**' - - '!docs/**' - - '!oap-server/**' + push: + branches: + - master + tags: + - 'v*' jobs: PluginsTest: @@ -74,3 +64,5 @@ jobs: run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests docker:build -DBUILD_NO=local - name: ${{ matrix.case.title }} run: bash test/plugin/run.sh ${{ matrix.case.name }} + - name: Report Coverage + run: bash -x tools/coverage/report.sh diff --git a/.github/workflows/plugins-test.2.yaml b/.github/workflows/plugins-test.2.yaml index a04095c9ce3f..2f11f79c2979 100644 --- a/.github/workflows/plugins-test.2.yaml +++ b/.github/workflows/plugins-test.2.yaml @@ -18,21 +18,11 @@ name: PluginsTest on: pull_request: - paths: - - '.github/workflows/plugins-test*.yaml' - - 'apm-application-toolkit/**' - - 'apm-commons/**' - - 'apm-protocol/**' - - 'apm-sniffer/**' - - 'test/plugin/**' - - '**/pom.xml' - - '!test/e2e/**' - - '!apm-webapp/**' - - '!apm-dist/**' - - '!apm-dist-es7/**' - - '!apm-docker/**' - - '!docs/**' - - '!oap-server/**' + push: + branches: + - master + tags: + - 'v*' jobs: PluginsTest: @@ -84,4 +74,6 @@ jobs: - name: Build Docker image run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests docker:build -DBUILD_NO=local - name: ${{ matrix.case.title }} - run: bash test/plugin/run.sh ${{ matrix.case.name }} \ No newline at end of file + run: bash test/plugin/run.sh ${{ matrix.case.name }} + - name: Report Coverage + run: bash -x tools/coverage/report.sh diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml index 2f346bb0e7bc..4870180bc68a 100644 --- a/.github/workflows/plugins-test.3.yaml +++ b/.github/workflows/plugins-test.3.yaml @@ -18,21 +18,11 @@ name: PluginsTest on: pull_request: - paths: - - '.github/workflows/plugins-test*.yaml' - - 'apm-application-toolkit/**' - - 'apm-commons/**' - - 'apm-protocol/**' - - 'apm-sniffer/**' - - 'test/plugin/**' - - '**/pom.xml' - - '!test/e2e/**' - - '!apm-webapp/**' - - '!apm-dist/**' - - '!apm-dist-es7/**' - - '!apm-docker/**' - - '!docs/**' - - '!oap-server/**' + push: + branches: + - master + tags: + - 'v*' jobs: PluginsTest: @@ -62,6 +52,8 @@ jobs: run: ./mvnw --batch-mode -f test/plugin/pom.xml clean package -DskipTests docker:build -DBUILD_NO=local - name: ${{ matrix.case.title }} run: bash test/plugin/run.sh ${{ matrix.case.name }} + - name: Report Coverage + run: bash -x tools/coverage/report.sh Oracle: name: Oracle @@ -86,4 +78,6 @@ jobs: curl -O https://skyapm.github.io/ci-assist/jars/ojdbc14-10.2.0.4.0.jar curl -L -o ./skywalking-agent/plugins/apm-oracle-10.x-plugin-1.0.1.jar https://github.com/SkyAPM/java-plugin-extensions/releases/download/1.0.1/apm-oracle-10.x-plugin-1.0.1.jar ./mvnw --batch-mode install:install-file -Dfile=ojdbc14-10.2.0.4.0.jar -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.4.0 -Dpackaging=jar - bash test/plugin/run.sh oracle-scenario \ No newline at end of file + bash test/plugin/run.sh oracle-scenario + - name: Report Coverage + run: bash -x tools/coverage/report.sh diff --git a/README.md b/README.md index 246da25952cf..b3279a606428 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ microservices, cloud native and container-based (Docker, Kubernetes, Mesos) arch [![Maven Central](https://img.shields.io/maven-central/v/org.apache.skywalking/apache-skywalking-apm.svg)](http://skywalking.apache.org/downloads/) [![CI/IT Tests](https://github.com/apache/skywalking/workflows/CI%20AND%20IT/badge.svg?branch=master)](https://github.com/apache/skywalking/actions?query=branch%3Amaster+event%3Apush+workflow%3A%22CI+AND+IT%22) [![E2E Tests](https://github.com/apache/skywalking/workflows/E2E/badge.svg?branch=master)](https://github.com/apache/skywalking/actions?query=branch%3Amaster+event%3Apush+workflow%3AE2E) +[![Code Coverage](https://codecov.io/gh/apache/skywalking/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/skywalking/branch/master) # Abstract **SkyWalking** is an open source APM system, including monitoring, tracing, diagnosing capabilities for distributed system diff --git a/test/e2e/e2e-test/docker/profile/download-mysql.sh b/lombok.config old mode 100755 new mode 100644 similarity index 68% rename from test/e2e/e2e-test/docker/profile/download-mysql.sh rename to lombok.config index 970937c9318a..7d97bd9aa922 --- a/test/e2e/e2e-test/docker/profile/download-mysql.sh +++ b/lombok.config @@ -1,3 +1,4 @@ +# # 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. @@ -12,16 +13,6 @@ # 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. -#!/usr/bin/env bash - -set -ex - -SW_HOME=/skywalking -MYSQL_URL="https://repo.maven.apache.org/maven2/mysql/mysql-connector-java/8.0.13/mysql-connector-java-8.0.13.jar" -MYSQL_DRIVER="mysql-connector-java-8.0.13.jar" +# -curl -L -o "${SW_HOME}/oap-libs/${MYSQL_DRIVER}" ${MYSQL_URL} -if [[ $? -ne 0 ]]; then - echo "Fail to download ${MYSQL_DRIVER}." - exit 1 -fi +lombok.addLombokGeneratedAnnotation = true diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java index 0ec093d0f189..71ab5d45147f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java @@ -26,7 +26,7 @@ import org.apache.skywalking.oap.server.core.analysis.DownSampling; import org.apache.skywalking.oap.server.core.analysis.TimeBucket; import org.apache.skywalking.oap.server.core.analysis.worker.NoneStreamingProcessor; -import org.apache.skywalking.oap.server.core.profile.entity.ProfileTaskCreationResult; +import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskCreationResult; import org.apache.skywalking.oap.server.core.query.entity.ProfileTask; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskCreationResult.java similarity index 95% rename from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java rename to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskCreationResult.java index 5a8842205410..d4fb580a340a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskCreationResult.java @@ -16,7 +16,7 @@ * */ -package org.apache.skywalking.oap.server.core.profile.entity; +package org.apache.skywalking.oap.server.core.query.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java index 4849c9e27a92..f65a70d8d209 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java @@ -23,7 +23,7 @@ import org.apache.skywalking.oap.query.graphql.type.ProfileTaskCreationRequest; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.profile.ProfileTaskMutationService; -import org.apache.skywalking.oap.server.core.profile.entity.ProfileTaskCreationResult; +import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskCreationResult; import org.apache.skywalking.oap.server.library.module.ModuleManager; /** diff --git a/pom.xml b/pom.xml index 0f0cec4b8b98..4f21498a7ad9 100755 --- a/pom.xml +++ b/pom.xml @@ -622,9 +622,6 @@ org/apache/skywalking/oap/server/core/remote/grpc/proto/*.class org/apache/skywalking/oal/rt/grammar/*.class org/apache/skywalking/oap/server/exporter/grpc/*.class - org/apache/skywalking/oap/server/configuration/service/*.class - org/apache/skywalking/oap/server/starter/OAPServerStartUp.class - org/apache/skywalking/apm/toolkit/**/*Activation.class org/apache/skywalking/apm/plugin/**/*Instrumentation.class org/apache/skywalking/apm/plugin/**/*Instrumentation$*.class diff --git a/test/e2e/e2e-service-consumer/src/main/resources/application.yml b/test/e2e/e2e-service-consumer/src/main/resources/application.yml index 61b30de3ed5a..d85955be48e7 100644 --- a/test/e2e/e2e-service-consumer/src/main/resources/application.yml +++ b/test/e2e/e2e-service-consumer/src/main/resources/application.yml @@ -21,4 +21,4 @@ spring: banner-mode: 'off' e2e: - provider-base-url: ${PROVIDER_URL:http://127.0.0.1:9090} \ No newline at end of file + provider-base-url: ${PROVIDER_URL:http://127.0.0.1:9090} diff --git a/test/e2e/e2e-test/docker/Dockerfile.consumer b/test/e2e/e2e-test/docker/Dockerfile.consumer index b1802e139979..ed11c0f7c9d1 100644 --- a/test/e2e/e2e-test/docker/Dockerfile.consumer +++ b/test/e2e/e2e-test/docker/Dockerfile.consumer @@ -29,6 +29,6 @@ VOLUME /services ADD e2e-service-consumer/target/e2e-service-consumer-1.0.0.jar /services/ -ENV SW_AGENT_PROPS="" +ENV JAVA_OPTS="" -CMD ["sh", "-c", "java -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,$SW_AGENT_PROPS -jar /services/e2e-service-consumer-1.0.0.jar"] \ No newline at end of file +CMD ["sh", "-c", "java $JAVA_OPTS -jar /services/e2e-service-consumer-1.0.0.jar"] diff --git a/test/e2e/e2e-test/docker/Dockerfile.provider b/test/e2e/e2e-test/docker/Dockerfile.provider index fdb1cd5371f4..89d2def393b6 100644 --- a/test/e2e/e2e-test/docker/Dockerfile.provider +++ b/test/e2e/e2e-test/docker/Dockerfile.provider @@ -29,6 +29,6 @@ VOLUME /services ADD e2e-service-provider/target/e2e-service-provider-1.0.0.jar /services/ -ENV SW_AGENT_PROPS="" +ENV JAVA_OPTS="" -CMD ["sh", "-c", "java -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,$SW_AGENT_PROPS -jar /services/e2e-service-provider-1.0.0.jar"] \ No newline at end of file +CMD ["sh", "-c", "java $JAVA_OPTS -jar /services/e2e-service-provider-1.0.0.jar"] diff --git a/test/e2e/e2e-test/docker/base-compose.yml b/test/e2e/e2e-test/docker/base-compose.yml new file mode 100644 index 000000000000..1769914ab192 --- /dev/null +++ b/test/e2e/e2e-test/docker/base-compose.yml @@ -0,0 +1,123 @@ +# 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 + networks: + - e2e + restart: on-failure + volumes: + - ../../../jacoco:/jacoco + - ./download-mysql.sh:/download-mysql.sh + environment: + SW_CLUSTER_ZK_HOST_PORT: zk:2181 + SW_STORAGE_ES_CLUSTER_NODES: es:9200 + SW_JDBC_URL: jdbc:mysql://mysql:3306/swtest + SW_STORAGE_INFLUXDB_URL: http://influxdb:8086 + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap,destfile=/jacoco/oap.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* + healthcheck: + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] + interval: 5s + timeout: 60s + retries: 120 + + oap-es7: + image: skywalking/oap:latest-es7 + expose: + - 11800 + - 12800 + networks: + - e2e + restart: on-failure + volumes: + - ../../../jacoco:/jacoco + - ./download-mysql.sh:/download-mysql.sh + environment: + SW_CLUSTER_ZK_HOST_PORT: zk:2181 + SW_STORAGE_ES_CLUSTER_NODES: es:9200 + SW_JDBC_URL: jdbc:mysql://mysql:3306/swtest + SW_STORAGE_INFLUXDB_URL: http://influxdb:8086 + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap,destfile=/jacoco/oap.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* + healthcheck: + test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] + interval: 5s + timeout: 60s + retries: 120 + + ui: + image: skywalking/ui:latest + expose: + - 8080 + networks: + - e2e + environment: + - SW_OAP_ADDRESS=oap:12800 + + provider: + build: + context: ../../ + dockerfile: e2e-test/docker/Dockerfile.provider + args: + - SW_AGENT_JDK_VERSION=${SW_AGENT_JDK_VERSION} + networks: + - e2e + expose: + - 9090 + volumes: + - ../../../jacoco:/jacoco + environment: + SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap:11800 + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/provider,destfile=/jacoco/provider.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.* + -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE + healthcheck: + test: ["CMD", "sh", "-c", "nc -nz 127.0.0.1 9090"] + interval: 5s + timeout: 60s + retries: 120 + + consumer: + build: + context: ../../ + dockerfile: e2e-test/docker/Dockerfile.consumer + args: + - SW_AGENT_JDK_VERSION=${SW_AGENT_JDK_VERSION} + networks: + - e2e + expose: + - 9092 + volumes: + - ../../../jacoco:/jacoco + environment: + SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap:11800 + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/consumer,destfile=/jacoco/consumer.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.* + -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE + healthcheck: + test: ["CMD", "sh", "-c", "nc -nz 127.0.0.1 9092"] + interval: 5s + timeout: 60s + retries: 120 + +networks: + e2e: diff --git a/test/e2e/e2e-test/docker/cluster/docker-compose.yml b/test/e2e/e2e-test/docker/cluster/docker-compose.yml index b81737f26e52..6dad83c45561 100644 --- a/test/e2e/e2e-test/docker/cluster/docker-compose.yml +++ b/test/e2e/e2e-test/docker/cluster/docker-compose.yml @@ -17,11 +17,9 @@ version: '2.1' services: ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e + extends: + file: ../base-compose.yml + service: ui environment: - SW_OAP_ADDRESS=oap1:12800,oap2:12800 depends_on: @@ -31,60 +29,44 @@ services: condition: service_healthy provider1: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 + extends: + file: ../base-compose.yml + service: provider environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap2:11800 - - SW_AGENT_NAME=e2e-service-provider - - SW_AGENT_PROPS=agent.instance_name=provider1 - healthcheck: - test: ["CMD", "sh", "-c", "nc -z 127.0.0.1 9090"] - interval: 5s - timeout: 60s - retries: 120 + SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800 + SW_AGENT_NAME: e2e-service-provider + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/provider1,destfile=/jacoco/provider1.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.* + -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,agent.instance_name=provider1 depends_on: - oap2: + oap1: condition: service_healthy provider2: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 + extends: + file: ../base-compose.yml + service: provider environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap2:11800 - - SW_AGENT_NAME=e2e-service-provider - - SW_AGENT_PROPS=agent.instance_name=provider2 - healthcheck: - test: ["CMD", "sh", "-c", "nc -z 127.0.0.1 9090"] - interval: 5s - timeout: 60s - retries: 120 + SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap2:11800 + SW_AGENT_NAME: e2e-service-provider + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/provider2,destfile=/jacoco/provider2.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.* + -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,agent.instance_name=provider2 depends_on: oap2: condition: service_healthy consumer: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.consumer - networks: - - e2e - expose: - - 9092 + extends: + file: ../base-compose.yml + service: consumer environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap1:11800 - - SW_AGENT_NAME=e2e-service-consumer - - SW_AGENT_PROPS=agent.instance_name=consumer - - PROVIDER_URL=http://provider1:9090,http://provider2:9090 + SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800 + SW_AGENT_NAME: e2e-service-consumer + PROVIDER_URL: http://provider1:9090,http://provider2:9090 + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/consumer,destfile=/jacoco/consumer.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.* + -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,agent.instance_name=consumer depends_on: oap1: condition: service_healthy diff --git a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es6.yml b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es6.yml index 38a6b8227db5..e58cf3447d3d 100644 --- a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es6.yml +++ b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es6.yml @@ -31,23 +31,14 @@ services: retries: 120 oap1: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=elasticsearch - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_CLUSTER: zookeeper + SW_STORAGE: elasticsearch + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap1,destfile=/jacoco/oap1.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* depends_on: zk: condition: service_healthy @@ -55,23 +46,14 @@ services: condition: service_healthy oap2: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=elasticsearch - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_CLUSTER: zookeeper + SW_STORAGE: elasticsearch + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap2,destfile=/jacoco/oap2.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* depends_on: zk: condition: service_healthy @@ -81,4 +63,4 @@ services: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es7.yml b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es7.yml index 156b60be6977..29628ad4c440 100644 --- a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es7.yml +++ b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es7.yml @@ -31,23 +31,14 @@ services: retries: 120 oap1: - image: skywalking/oap:latest-es7 - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap-es7 environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=elasticsearch7 - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_CLUSTER: zookeeper + SW_STORAGE: elasticsearch7 + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap1,destfile=/jacoco/oap1.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* depends_on: zk: condition: service_healthy @@ -55,23 +46,14 @@ services: condition: service_healthy oap2: - image: skywalking/oap:latest-es7 - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap-es7 environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=elasticsearch7 - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_CLUSTER: zookeeper + SW_STORAGE: elasticsearch7 + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap2,destfile=/jacoco/oap2.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* depends_on: zk: condition: service_healthy @@ -81,4 +63,4 @@ services: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.influxdb.yml b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.influxdb.yml index 6d5d68dea379..f45532133de3 100644 --- a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.influxdb.yml +++ b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.influxdb.yml @@ -16,22 +16,6 @@ version: '2.1' services: - mysql: - image: mysql/mysql-server:8.0.13 - networks: - - e2e - expose: - - 3306 - environment: - - MYSQL_ROOT_PASSWORD=root@1234 - - MYSQL_DATABASE=swtest - - MYSQL_ROOT_HOST=% - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306"] - interval: 5s - timeout: 60s - retries: 120 - influxdb: image: influxdb:1.7.9 expose: @@ -45,62 +29,30 @@ services: retries: 120 oap1: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=influxdb - - SW_STORAGE_INFLUXDB_URL=http://influxdb:8086 - - SW_STORAGE_METABASE_TYPE=mysql - - SW_STORAGE_METABASE_URL=jdbc:mysql://mysql:3306/swtest - volumes: - - ./download-mysql.sh:/download-mysql.sh - restart: on-failure - entrypoint: ['bash', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh'] - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_CLUSTER: zookeeper + SW_STORAGE: influxdb + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap1,destfile=/jacoco/oap1.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* depends_on: - mysql: - condition: service_healthy zk: condition: service_healthy influxdb: condition: service_healthy oap2: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=influxdb - - SW_STORAGE_INFLUXDB_URL=http://influxdb:8086 - - SW_STORAGE_METABASE_TYPE=mysql - - SW_STORAGE_METABASE_URL=jdbc:mysql://mysql:3306/swtest - volumes: - - ./download-mysql.sh:/download-mysql.sh - restart: on-failure - entrypoint: ['bash', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh'] - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_CLUSTER: zookeeper + SW_STORAGE: influxdb + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap2,destfile=/jacoco/oap2.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* depends_on: - mysql: - condition: service_healthy zk: condition: service_healthy influxdb: @@ -109,4 +61,4 @@ services: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.mysql.yml b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.mysql.yml index 0724ef8949e9..1d750ef18a65 100644 --- a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.mysql.yml +++ b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.mysql.yml @@ -33,25 +33,14 @@ services: retries: 120 oap1: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=mysql - - SW_JDBC_URL=jdbc:mysql://mysql:3306/swtest - volumes: - - ./download-mysql.sh:/download-mysql.sh - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_CLUSTER: zookeeper + SW_STORAGE: mysql + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap1,destfile=/jacoco/oap1.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* entrypoint: ['bash', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh'] depends_on: zk: @@ -60,25 +49,14 @@ services: condition: service_healthy oap2: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=mysql - - SW_JDBC_URL=jdbc:mysql://mysql:3306/swtest - volumes: - - ./download-mysql.sh:/download-mysql.sh - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_CLUSTER: zookeeper + SW_STORAGE: mysql + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap2,destfile=/jacoco/oap2.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* entrypoint: ['bash', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh'] depends_on: zk: @@ -89,4 +67,4 @@ services: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/cluster/download-mysql.sh b/test/e2e/e2e-test/docker/download-mysql.sh similarity index 100% rename from test/e2e/e2e-test/docker/cluster/download-mysql.sh rename to test/e2e/e2e-test/docker/download-mysql.sh diff --git a/test/e2e/e2e-test/docker/gateway/docker-compose.yml b/test/e2e/e2e-test/docker/gateway/docker-compose.yml index dd11620b24ed..242c63fcc04e 100644 --- a/test/e2e/e2e-test/docker/gateway/docker-compose.yml +++ b/test/e2e/e2e-test/docker/gateway/docker-compose.yml @@ -43,18 +43,14 @@ services: retries: 120 oap1: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=elasticsearch - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure + SW_CLUSTER: zookeeper + SW_STORAGE: elasticsearch + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap1,destfile=/jacoco/oap1.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* volumes: - ./gateways.yml:/skywalking/config/gateways.yml depends_on: @@ -62,25 +58,16 @@ services: condition: service_healthy es: condition: service_healthy - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 oap2: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_CLUSTER=zookeeper - - SW_CLUSTER_ZK_HOST_PORT=zk:2181 - - SW_STORAGE=elasticsearch - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure + SW_CLUSTER: zookeeper + SW_STORAGE: elasticsearch + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/oap2,destfile=/jacoco/oap2.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.* volumes: - ./gateways.yml:/skywalking/config/gateways.yml depends_on: @@ -90,18 +77,11 @@ services: condition: service_healthy oap1: condition: service_healthy - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e + extends: + file: ../base-compose.yml + service: ui environment: - SW_OAP_ADDRESS=oap1:12800,oap2:12800 depends_on: @@ -111,57 +91,35 @@ services: condition: service_healthy provider1: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 + extends: + file: ../base-compose.yml + service: provider environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap2:11800 - - SW_AGENT_NAME=e2e-service-provider + SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800 + SW_AGENT_NAME: e2e-service-provider depends_on: - oap2: + oap1: condition: service_healthy - healthcheck: - test: ["CMD", "sh", "-c", "nc -z 127.0.0.1 9090"] - interval: 5s - timeout: 60s - retries: 120 provider2: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 + extends: + file: ../base-compose.yml + service: provider environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap2:11800 - - SW_AGENT_NAME=e2e-service-provider + SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap2:11800 + SW_AGENT_NAME: e2e-service-provider depends_on: oap2: condition: service_healthy - healthcheck: - test: ["CMD", "sh", "-c", "nc -z 127.0.0.1 9090"] - interval: 5s - timeout: 60s - retries: 120 consumer: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.consumer - networks: - - e2e - expose: - - 9092 + extends: + file: ../base-compose.yml + service: consumer environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap1:11800 - - SW_AGENT_NAME=e2e-service-consumer - - PROVIDER_URL=http://gateway + SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap1:11800 + SW_AGENT_NAME: e2e-service-consumer + PROVIDER_URL: http://gateway depends_on: oap1: condition: service_healthy @@ -182,4 +140,4 @@ services: restart: on-failure networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/go/docker-compose.yml b/test/e2e/e2e-test/docker/go/docker-compose.yml index c1cfbc7e7a54..213c81a06229 100644 --- a/test/e2e/e2e-test/docker/go/docker-compose.yml +++ b/test/e2e/e2e-test/docker/go/docker-compose.yml @@ -17,50 +17,27 @@ version: '2.1' services: oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + extends: + file: ../base-compose.yml + service: oap ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../base-compose.yml + service: ui depends_on: oap: condition: service_healthy java-provider: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 + extends: + file: ../base-compose.yml + service: provider environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 - - SW_AGENT_NAME=e2e-service-java-provider + SW_AGENT_NAME: e2e-service-java-provider depends_on: oap: condition: service_healthy - healthcheck: - test: ["CMD", "sh", "-c", "nc -z 127.0.0.1 9090"] - interval: 5s - timeout: 60s - retries: 120 go2sky: build: @@ -83,27 +60,17 @@ services: retries: 120 java-consumer: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.consumer - networks: - - e2e - expose: - - 9092 + extends: + file: ../base-compose.yml + service: consumer environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 - - SW_AGENT_NAME=e2e-service-java-consumer - - PROVIDER_URL=http://go2sky:8080 + SW_AGENT_NAME: e2e-service-java-consumer + PROVIDER_URL: http://go2sky:8080 depends_on: oap: condition: service_healthy go2sky: condition: service_healthy - healthcheck: - test: ["CMD", "sh", "-c", "nc -z 127.0.0.1 9092"] - interval: 5s - timeout: 60s - retries: 120 networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/lua/docker-compose.yml b/test/e2e/e2e-test/docker/lua/docker-compose.yml index 1752bb7b4768..ac600ef6ac18 100644 --- a/test/e2e/e2e-test/docker/lua/docker-compose.yml +++ b/test/e2e/e2e-test/docker/lua/docker-compose.yml @@ -17,70 +17,37 @@ version: '2.1' services: oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + extends: + file: ../base-compose.yml + service: oap ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../base-compose.yml + service: ui depends_on: oap: condition: service_healthy provider-entry: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 + extends: + file: ../base-compose.yml + service: provider environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 - - SW_AGENT_NAME=e2e-service-entry-provider + SW_AGENT_NAME: e2e-service-entry-provider depends_on: oap: condition: service_healthy - healthcheck: - test: ["CMD", "sh", "-c", "nc -z 127.0.0.1 9090"] - interval: 5s - timeout: 60s - retries: 120 provider-end: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 + extends: + file: ../base-compose.yml + service: provider environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 - - SW_AGENT_NAME=e2e-service-end-provider + SW_AGENT_NAME: e2e-service-end-provider depends_on: oap: condition: service_healthy - healthcheck: - test: ["CMD", "sh", "-c", "nc -z 127.0.0.1 9090"] - interval: 5s - timeout: 60s - retries: 120 nginx: build: @@ -102,4 +69,4 @@ services: entrypoint: ['bash', '-c', 'sleep 5 && /usr/bin/openresty -c /var/nginx/conf.d/nginx.conf'] networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/php/docker-compose.yml b/test/e2e/e2e-test/docker/php/docker-compose.yml index 8b8bd388fe62..dcadec819433 100644 --- a/test/e2e/e2e-test/docker/php/docker-compose.yml +++ b/test/e2e/e2e-test/docker/php/docker-compose.yml @@ -17,18 +17,9 @@ version: '2.1' services: oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + extends: + file: ../base-compose.yml + service: oap php-shadow: image: skyapm/skywalking-php:v3.2.8 @@ -63,13 +54,9 @@ services: - ./php.ini:/usr/local/etc/php/conf.d/ext-skywalking.ini ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../../base-compose.yml + service: ui depends_on: php: condition: service_started @@ -79,4 +66,4 @@ services: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml b/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml index 85ceff0bab11..0294cd1106f6 100644 --- a/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml +++ b/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml @@ -31,24 +31,14 @@ services: retries: 120 oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_STORAGE=elasticsearch - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_STORAGE: elasticsearch depends_on: es: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml b/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml index bbf8c3ea4eb8..07fa318d2522 100644 --- a/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml +++ b/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml @@ -31,24 +31,14 @@ services: retries: 120 oap: - image: skywalking/oap:latest-es7 - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap-es7 environment: - - SW_STORAGE=elasticsearch7 - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_STORAGE: elasticsearch7 depends_on: es: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.h2.yml b/test/e2e/e2e-test/docker/profile/docker-compose.h2.yml index 5fd67baedfd4..915da97696b3 100644 --- a/test/e2e/e2e-test/docker/profile/docker-compose.h2.yml +++ b/test/e2e/e2e-test/docker/profile/docker-compose.h2.yml @@ -31,23 +31,15 @@ services: retries: 120 oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_STORAGE_H2_URL=jdbc:h2:tcp://h2db:1521/skywalking-oap-db - restart: on-failure + SW_STORAGE: h2 + SW_STORAGE_H2_URL: jdbc:h2:tcp://h2db:1521/skywalking-oap-db depends_on: h2db: condition: service_healthy - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.influxdb.yml b/test/e2e/e2e-test/docker/profile/docker-compose.influxdb.yml index dd967b3902e9..4f0dc477f5fc 100644 --- a/test/e2e/e2e-test/docker/profile/docker-compose.influxdb.yml +++ b/test/e2e/e2e-test/docker/profile/docker-compose.influxdb.yml @@ -16,20 +16,6 @@ version: '2.1' services: - h2db: - build: - context: . - dockerfile: Dockerfile.h2 - networks: - - e2e - expose: - - 1521 - healthcheck: - test: ["CMD", "sh", "-c", "nc -z 127.0.0.1 1521"] - interval: 5s - timeout: 60s - retries: 120 - influxdb: image: influxdb:1.7.9 expose: @@ -45,27 +31,16 @@ services: retries: 120 oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_STORAGE=influxdb - - SW_STORAGE_INFLUXDB_URL=http://influxdb:8086 - - SW_STORAGE_METABASE_URL=jdbc:h2:tcp://h2db:1521/skywalking-oap-db - restart: on-failure + SW_STORAGE: influxdb depends_on: h2db: condition: service_healthy influxdb: condition: service_healthy - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.mysql.yml b/test/e2e/e2e-test/docker/profile/docker-compose.mysql.yml index 5c8ce606941e..aa4c5d1d1ba7 100644 --- a/test/e2e/e2e-test/docker/profile/docker-compose.mysql.yml +++ b/test/e2e/e2e-test/docker/profile/docker-compose.mysql.yml @@ -33,27 +33,15 @@ services: retries: 120 oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - volumes: - - ./download-mysql.sh:/download-mysql.sh - restart: on-failure + extends: + file: ../base-compose.yml + service: oap + environment: + SW_STORAGE: mysql depends_on: mysql: condition: service_healthy - environment: - - SW_STORAGE=mysql - - SW_JDBC_URL=jdbc:mysql://mysql:3306/swtest entrypoint: ['bash', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh'] - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.yml b/test/e2e/e2e-test/docker/profile/docker-compose.yml index de935d98d262..6dffbc128106 100644 --- a/test/e2e/e2e-test/docker/profile/docker-compose.yml +++ b/test/e2e/e2e-test/docker/profile/docker-compose.yml @@ -17,31 +17,22 @@ version: '2.1' services: ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../base-compose.yml + service: ui depends_on: oap: condition: service_healthy provider: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 + extends: + file: ../base-compose.yml + service: provider environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 - - SW_AGENT_NAME=e2e-profile-service + SW_AGENT_NAME: e2e-profile-service depends_on: oap: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/simple/auth/docker-compose.yml b/test/e2e/e2e-test/docker/simple/auth/docker-compose.yml index 1510ed252313..444e98232afb 100644 --- a/test/e2e/e2e-test/docker/simple/auth/docker-compose.yml +++ b/test/e2e/e2e-test/docker/simple/auth/docker-compose.yml @@ -17,47 +17,31 @@ version: '2.1' services: oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - restart: on-failure + extends: + file: ../../base-compose.yml + service: oap environment: - - SW_AUTHENTICATION=test-token - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_AUTHENTICATION: test-token ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../../base-compose.yml + service: ui depends_on: oap: condition: service_healthy provider: - build: - context: ../../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 + extends: + file: ../../base-compose.yml + service: provider environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 - - SW_AGENT_PROPS=agent.authentication=test-token + JAVA_OPTS: >- + -javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/provider,destfile=/jacoco/provider.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.* + -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,agent.authentication=test-token depends_on: oap: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/simple/compatibility/docker-compose.yml b/test/e2e/e2e-test/docker/simple/compatibility/docker-compose.yml deleted file mode 100644 index 9e98ceb66e65..000000000000 --- a/test/e2e/e2e-test/docker/simple/compatibility/docker-compose.yml +++ /dev/null @@ -1,62 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -version: '2.1' - -services: - oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 - - ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 - depends_on: - oap: - condition: service_healthy - - provider: - build: - context: ../../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - args: - - DIST_PACKAGE=http://archive.apache.org/dist/skywalking/6.5.0/apache-skywalking-apm-6.5.0.tar.gz - networks: - - e2e - expose: - - 9090 - environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 - depends_on: - oap: - condition: service_healthy - -networks: - e2e: \ No newline at end of file diff --git a/test/e2e/e2e-test/docker/simple/jdk/docker-compose.yml b/test/e2e/e2e-test/docker/simple/jdk/docker-compose.yml index 60fca0ba604f..562ed6195959 100644 --- a/test/e2e/e2e-test/docker/simple/jdk/docker-compose.yml +++ b/test/e2e/e2e-test/docker/simple/jdk/docker-compose.yml @@ -17,46 +17,25 @@ version: '2.1' services: oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + extends: + file: ../../base-compose.yml + service: oap ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../../base-compose.yml + service: ui depends_on: oap: condition: service_healthy provider: - build: - context: ../../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - args: - - SW_AGENT_JDK_VERSION=${SW_AGENT_JDK_VERSION} - networks: - - e2e - expose: - - 9090 - environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 + extends: + file: ../../base-compose.yml + service: provider depends_on: oap: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/simple/ssl/docker-compose.yml b/test/e2e/e2e-test/docker/simple/ssl/docker-compose.yml index 88c55868e0e7..97bd39737481 100644 --- a/test/e2e/e2e-test/docker/simple/ssl/docker-compose.yml +++ b/test/e2e/e2e-test/docker/simple/ssl/docker-compose.yml @@ -17,55 +17,34 @@ version: '2.1' services: oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - restart: on-failure + extends: + file: ../../base-compose.yml + service: oap volumes: - ./certs:/skywalking/certs environment: - - SW_CORE_GRPC_SSL_ENABLED=true - - SW_CORE_GRPC_SSL_KEY_PATH=/skywalking/certs/server-key.pem - - SW_CORE_GRPC_SSL_CERT_CHAIN_PATH=/skywalking/certs/server.crt - - SW_CORE_GRPC_SSL_TRUSTED_CA_PATH=/skywalking/certs/ca.crt - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_CORE_GRPC_SSL_ENABLED: "true" + SW_CORE_GRPC_SSL_KEY_PATH: /skywalking/certs/server-key.pem + SW_CORE_GRPC_SSL_CERT_CHAIN_PATH: /skywalking/certs/server.crt + SW_CORE_GRPC_SSL_TRUSTED_CA_PATH: /skywalking/certs/ca.crt ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../../base-compose.yml + service: ui depends_on: oap: condition: service_healthy provider: - build: - context: ../../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - args: - - SW_AGENT_JDK_VERSION=${SW_AGENT_JDK_VERSION} - networks: - - e2e - expose: - - 9090 + extends: + file: ../../base-compose.yml + service: provider volumes: - ./ca:/skywalking/agent/ca - environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 depends_on: oap: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml index 85ceff0bab11..0294cd1106f6 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml +++ b/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml @@ -31,24 +31,14 @@ services: retries: 120 oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_STORAGE=elasticsearch - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_STORAGE: elasticsearch depends_on: es: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml index bbf8c3ea4eb8..07fa318d2522 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml +++ b/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml @@ -31,24 +31,14 @@ services: retries: 120 oap: - image: skywalking/oap:latest-es7 - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap-es7 environment: - - SW_STORAGE=elasticsearch7 - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_STORAGE: elasticsearch7 depends_on: es: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.influxdb.yml b/test/e2e/e2e-test/docker/storage/docker-compose.influxdb.yml index e4eee49b8ff9..377ea791e024 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.influxdb.yml +++ b/test/e2e/e2e-test/docker/storage/docker-compose.influxdb.yml @@ -29,24 +29,14 @@ services: retries: 120 oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - restart: on-failure + extends: + file: ../base-compose.yml + service: oap environment: - - SW_STORAGE=influxdb - - SW_STORAGE_INFLUXDB_URL=http://influxdb:8086 + SW_STORAGE: influxdb depends_on: influxdb: condition: service_healthy - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.mysql.yml b/test/e2e/e2e-test/docker/storage/docker-compose.mysql.yml index 5c8ce606941e..aa4c5d1d1ba7 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.mysql.yml +++ b/test/e2e/e2e-test/docker/storage/docker-compose.mysql.yml @@ -33,27 +33,15 @@ services: retries: 120 oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e - volumes: - - ./download-mysql.sh:/download-mysql.sh - restart: on-failure + extends: + file: ../base-compose.yml + service: oap + environment: + SW_STORAGE: mysql depends_on: mysql: condition: service_healthy - environment: - - SW_STORAGE=mysql - - SW_JDBC_URL=jdbc:mysql://mysql:3306/swtest entrypoint: ['bash', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh'] - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.yml b/test/e2e/e2e-test/docker/storage/docker-compose.yml index 2040be0d238c..dc08580ba89d 100644 --- a/test/e2e/e2e-test/docker/storage/docker-compose.yml +++ b/test/e2e/e2e-test/docker/storage/docker-compose.yml @@ -17,30 +17,20 @@ version: '2.1' services: ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../base-compose.yml + service: ui depends_on: oap: condition: service_healthy provider: - build: - context: ../../../ - dockerfile: e2e-test/docker/Dockerfile.provider - networks: - - e2e - expose: - - 9090 - environment: - - SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800 + extends: + file: ../base-compose.yml + service: provider depends_on: oap: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/ttl/docker-compose.es6.yml b/test/e2e/e2e-test/docker/ttl/docker-compose.es6.yml index 9ec9a8bbbf6f..ebfe32b1205a 100644 --- a/test/e2e/e2e-test/docker/ttl/docker-compose.es6.yml +++ b/test/e2e/e2e-test/docker/ttl/docker-compose.es6.yml @@ -31,36 +31,22 @@ services: retries: 120 oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_STORAGE=elasticsearch - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - - SW_STORAGE_ES_BULK_ACTIONS=1 - - SW_CORE_DATA_KEEPER_EXECUTE_PERIOD=1 - - SW_STORAGE_ES_FLUSH_INTERVAL=1 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_STORAGE: elasticsearch + SW_STORAGE_ES_BULK_ACTIONS: 1 + SW_CORE_DATA_KEEPER_EXECUTE_PERIOD: 1 + SW_STORAGE_ES_FLUSH_INTERVAL: 1 depends_on: es: condition: service_healthy ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../base-compose.yml + service: ui depends_on: oap: condition: service_healthy diff --git a/test/e2e/e2e-test/docker/ttl/docker-compose.es7.yml b/test/e2e/e2e-test/docker/ttl/docker-compose.es7.yml index b658d767ac19..637d5b66fe71 100644 --- a/test/e2e/e2e-test/docker/ttl/docker-compose.es7.yml +++ b/test/e2e/e2e-test/docker/ttl/docker-compose.es7.yml @@ -31,36 +31,22 @@ services: retries: 120 oap: - image: skywalking/oap:latest-es7 - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap-es7 environment: - - SW_STORAGE=elasticsearch7 - - SW_STORAGE_ES_CLUSTER_NODES=es:9200 - - SW_STORAGE_ES_BULK_ACTIONS=1 - - SW_CORE_DATA_KEEPER_EXECUTE_PERIOD=1 - - SW_STORAGE_ES_FLUSH_INTERVAL=1 - restart: on-failure - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 + SW_STORAGE: elasticsearch7 + SW_STORAGE_ES_BULK_ACTIONS: 1 + SW_CORE_DATA_KEEPER_EXECUTE_PERIOD: 1 + SW_STORAGE_ES_FLUSH_INTERVAL: 1 depends_on: es: condition: service_healthy ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../base-compose.yml + service: ui depends_on: oap: condition: service_healthy diff --git a/test/e2e/e2e-test/docker/ttl/docker-compose.influxdb.yml b/test/e2e/e2e-test/docker/ttl/docker-compose.influxdb.yml index f502ae912478..fd7b32406a6b 100644 --- a/test/e2e/e2e-test/docker/ttl/docker-compose.influxdb.yml +++ b/test/e2e/e2e-test/docker/ttl/docker-compose.influxdb.yml @@ -29,30 +29,20 @@ services: retries: 120 oap: - image: skywalking/oap:latest - expose: - - 11800 - - 12800 - networks: - - e2e + extends: + file: ../base-compose.yml + service: oap environment: - - SW_STORAGE=influxdb - - SW_STORAGE_INFLUXDB_URL=http://influxdb:8086 - - SW_CORE_DATA_KEEPER_EXECUTE_PERIOD=1 - - SW_CORE_RECORD_DATA_TTL=7 - - SW_CORE_MINUTE_METRIC_DATA_TTL=6000 - - SW_CORE_HOUR_METRIC_DATA_TTL=100 - - SW_CORE_DAY_METRIC_DATA_TTL=5 - - SW_CORE_MONTH_METRIC_DATA_TTL=4 - restart: on-failure + SW_STORAGE: influxdb + SW_CORE_DATA_KEEPER_EXECUTE_PERIOD: 1 + SW_CORE_RECORD_DATA_TTL: 7 + SW_CORE_MINUTE_METRIC_DATA_TTL: 6000 + SW_CORE_HOUR_METRIC_DATA_TTL: 100 + SW_CORE_DAY_METRIC_DATA_TTL: 5 + SW_CORE_MONTH_METRIC_DATA_TTL: 4 depends_on: influxdb: condition: service_healthy - healthcheck: - test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"] - interval: 5s - timeout: 60s - retries: 120 networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/docker/ttl/docker-compose.yml b/test/e2e/e2e-test/docker/ttl/docker-compose.yml index d33f5b191e32..b8d5ded49558 100644 --- a/test/e2e/e2e-test/docker/ttl/docker-compose.yml +++ b/test/e2e/e2e-test/docker/ttl/docker-compose.yml @@ -17,16 +17,12 @@ version: '2.1' services: ui: - image: skywalking/ui:latest - expose: - - 8080 - networks: - - e2e - environment: - - SW_OAP_ADDRESS=oap:12800 + extends: + file: ../base-compose.yml + service: ui depends_on: oap: condition: service_healthy networks: - e2e: \ No newline at end of file + e2e: diff --git a/test/e2e/e2e-test/e2e-cluster-test-runner.iml b/test/e2e/e2e-test/e2e-cluster-test-runner.iml deleted file mode 100644 index 4f13c69caadb..000000000000 --- a/test/e2e/e2e-test/e2e-cluster-test-runner.iml +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/jacoco/jacocoagent.jar b/test/jacoco/jacocoagent.jar new file mode 100644 index 000000000000..3d840bc5466d Binary files /dev/null and b/test/jacoco/jacocoagent.jar differ diff --git a/test/jacoco/jacococli.jar b/test/jacoco/jacococli.jar new file mode 100644 index 000000000000..20ba9741026f Binary files /dev/null and b/test/jacoco/jacococli.jar differ diff --git a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/configuration.yml b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/configuration.yml index 38559c636040..6fa172b5c0a5 100644 --- a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/configuration.yml +++ b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/${scenario_name}/case/${scenario_case} healthCheck: http://localhost:8080/${scenario_name}/case/healthCheck startScript: ./bin/startup.sh -framework: ${scenario_name} environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/configuration.yml b/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/configuration.yml index 50d957121e26..dedf7f933baa 100644 --- a/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/configuration.yml +++ b/test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/configuration.yml @@ -17,6 +17,5 @@ type: tomcat entryService: http://localhost:8080/${scenario_name}/case/${scenario_case} healthCheck: http://localhost:8080/${scenario_name}/case/healthCheck -framework: ${scenario_name} environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/containers/jvm-container/docker/run.sh b/test/plugin/containers/jvm-container/docker/run.sh index d66d8d55ad30..121eb732a054 100644 --- a/test/plugin/containers/jvm-container/docker/run.sh +++ b/test/plugin/containers/jvm-container/docker/run.sh @@ -51,6 +51,7 @@ fi TOOLS_HOME=/usr/local/skywalking/tools SCENARIO_HOME=/usr/local/skywalking/scenario +JACOCO_HOME=${JACOCO_HOME:-/jacoco} unzip -q ${SCENARIO_HOME}/*.zip -d /var/run/ if [[ ! -f /var/run/${SCENARIO_NAME}/${SCENARIO_START_SCRIPT} ]]; then @@ -62,7 +63,9 @@ ${TOOLS_HOME}/skywalking-mock-collector/bin/collector-startup.sh 1>/dev/null & healthCheck http://localhost:12800/receiveData # start applications -export agent_opts="-javaagent:${SCENARIO_HOME}/agent/skywalking-agent.jar +export agent_opts=" + -javaagent:${JACOCO_HOME}/jacocoagent.jar=classdumpdir=${JACOCO_HOME}/classes/${SCENARIO_NAME}${SCENARIO_VERSION},destfile=${JACOCO_HOME}/${SCENARIO_NAME}${SCENARIO_VERSION}.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.*:org.apache.skywalking.apm.testcase.* + -javaagent:${SCENARIO_HOME}/agent/skywalking-agent.jar -Dskywalking.collector.grpc_channel_check_interval=2 -Dskywalking.collector.heartbeat_period=2 -Dskywalking.collector.discovery_check_interval=2 diff --git a/test/plugin/containers/tomcat-container/docker/catalina.sh b/test/plugin/containers/tomcat-container/docker/catalina.sh index f6a3ebed3a6d..5b44bdfa7e10 100644 --- a/test/plugin/containers/tomcat-container/docker/catalina.sh +++ b/test/plugin/containers/tomcat-container/docker/catalina.sh @@ -104,10 +104,14 @@ # case the default is "true" # ----------------------------------------------------------------------------- +JACOCO_HOME=${JACOCO_HOME:-/jacoco} + export AGENT_FILE_PATH=/usr/local/skywalking/scenario/agent echo "${AGENT_FILE_PATH}/skywalking-agent.jar" if [ -f "${AGENT_FILE_PATH}/skywalking-agent.jar" ]; then - CATALINA_OPTS="$CATALINA_OPTS -javaagent:${AGENT_FILE_PATH}/skywalking-agent.jar + CATALINA_OPTS="$CATALINA_OPTS + -javaagent:${JACOCO_HOME}/jacocoagent.jar=classdumpdir=${JACOCO_HOME}/classes/${SCENARIO_NAME}${SCENARIO_VERSION},destfile=${JACOCO_HOME}/${SCENARIO_NAME}${SCENARIO_VERSION}.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.*:org.apache.skywalking.apm.testcase.* + -javaagent:${AGENT_FILE_PATH}/skywalking-agent.jar -Dskywalking.collector.grpc_channel_check_interval=2 -Dskywalking.collector.heartbeat_period=2 -Dskywalking.collector.discovery_check_interval=2 diff --git a/test/plugin/run.sh b/test/plugin/run.sh index 195553244b94..56b6c628478d 100755 --- a/test/plugin/run.sh +++ b/test/plugin/run.sh @@ -16,6 +16,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +set -ex + home="$(cd "$(dirname $0)"; pwd)" scenario_name="" parallel_run_size=1 @@ -23,7 +25,8 @@ force_build="off" cleanup="off" mvnw=${home}/../../mvnw -agent_home=${home}"/../../skywalking-agent" +agent_home="${home}"/../../skywalking-agent +jacoco_home="${home}"/../jacoco scenarios_home="${home}/scenarios" print_help() { @@ -34,7 +37,6 @@ print_help() { } parse_commandline() { - _positionals_count=0 while test $# -gt 0 do _key="$1" @@ -209,6 +211,7 @@ do -Dscenario.version=${version} \ -Doutput.dir=${case_work_base} \ -Dagent.dir=${_agent_home} \ + -Djacoco.home=${jacoco_home} \ -Ddocker.image.version=${BUILD_NO:=local} \ ${plugin_runner_helper} 1>${case_work_logs_dir}/helper.log diff --git a/test/plugin/runner-helper/pom.xml b/test/plugin/runner-helper/pom.xml index 39ea2fe8564c..c0109da433bb 100644 --- a/test/plugin/runner-helper/pom.xml +++ b/test/plugin/runner-helper/pom.xml @@ -45,12 +45,6 @@ test - - com.google.guava - guava - ${guava.version} - - org.freemarker freemarker diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java index 5a0ad9c43c35..960fb91c3b77 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java @@ -29,7 +29,7 @@ import org.apache.skywalking.plugin.test.helper.exception.GenerateFailedException; public abstract class AbstractRunningGenerator implements ScenarioRunningScriptGenerator { - private Logger logger = LogManager.getLogger(MethodHandles.lookup().lookupClass()); + private static final Logger logger = LogManager.getLogger(MethodHandles.lookup().lookupClass()); protected final Configuration cfg; protected AbstractRunningGenerator() { @@ -49,10 +49,8 @@ protected AbstractRunningGenerator() { public final void generate(IConfiguration configuration) throws GenerateFailedException { generateAdditionFiles(configuration); - Map root = new HashMap<>(); + final Map root = configuration.toMap(); root.put("running_script", runningScript(configuration)); - root.put("scenario_name", configuration.scenarioName()); - root.put("scenario_version", configuration.scenarioVersion()); try { cfg.getTemplate("scenario.sh") diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java index b9f4429a76b1..1ad38ad34104 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java @@ -18,23 +18,28 @@ package org.apache.skywalking.plugin.test.helper; import com.google.common.base.Strings; +import com.google.common.collect.Lists; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.skywalking.plugin.test.helper.exception.ConfigureFileNotFoundException; -import org.apache.skywalking.plugin.test.helper.util.StringUtils; import org.apache.skywalking.plugin.test.helper.vo.CaseConfiguration; +import org.apache.skywalking.plugin.test.helper.vo.DependencyComponent; +import org.apache.skywalking.plugin.test.helper.vo.DockerService; import org.yaml.snakeyaml.Yaml; public class ConfigurationImpl implements IConfiguration { - private CaseConfiguration configuration; + private final CaseConfiguration configuration; private final String scenarioHome; public ConfigurationImpl() throws FileNotFoundException, ConfigureFileNotFoundException { String configureFile = System.getProperty("configure.file"); - if (StringUtils.isBlank(configureFile)) { + if (Strings.isNullOrEmpty(configureFile)) { throw new ConfigureFileNotFoundException(); } @@ -86,11 +91,6 @@ public String scenarioVersion() { return System.getProperty("scenario.version"); } - @Override - public String testFramework() { - return this.configuration.getFramework(); - } - @Override public String entryService() { return this.configuration.getEntryService(); @@ -154,4 +154,81 @@ public String outputDir() { return System.getProperty("output.dir"); } + @Override + public String jacocoHome() { + return System.getProperty("jacoco.home"); + } + + @Override + public Map toMap() { + final Map root = new HashMap<>(); + + root.put("agent_home", agentHome()); + root.put("scenario_home", scenarioHome()); + root.put("scenario_name", scenarioName()); + root.put("scenario_version", scenarioVersion()); + root.put("health_check", healthCheck()); + root.put("start_script", startScript()); + root.put("catalina_opts", catalinaOpts()); + root.put("entry_service", entryService()); + root.put("docker_image_name", dockerImageName()); + root.put("docker_image_version", dockerImageVersion()); + root.put("docker_container_name", dockerContainerName()); + root.put("jacoco_home", jacocoHome()); + + root.put("expose", caseConfiguration().getExpose()); + root.put("hostname", caseConfiguration().getHostname()); + root.put("depends_on", caseConfiguration().getDepends_on()); + root.put("environments", caseConfiguration().getEnvironment()); + + root.put("network_name", dockerNetworkName()); + root.put("services", convertDockerServices(scenarioVersion(), caseConfiguration().getDependencies())); + + root.put("docker_compose_file", outputDir() + File.separator + "docker-compose.yml"); + root.put("build_id", dockerImageVersion()); + + final StringBuilder removeImagesScript = new StringBuilder(); + final ArrayList links = Lists.newArrayList(); + if (caseConfiguration().getDependencies() != null) { + caseConfiguration().getDependencies().forEach((name, service) -> { + links.add(service.getHostname()); + if (service.isRemoveOnExit()) { + removeImagesScript.append("docker rmi ") + .append( + service.getImage().replace("${CASE_SERVER_IMAGE_VERSION}", scenarioVersion())) + .append(System.lineSeparator()); + } + }); + } + root.put("links", links); + root.put("removeImagesScript", removeImagesScript.toString()); + + return root; + } + + protected List convertDockerServices(final String version, + Map componentMap) { + final ArrayList services = Lists.newArrayList(); + if (componentMap == null) { + return services; + } + componentMap.forEach((name, dependency) -> { + DockerService service = new DockerService(); + + String imageName = dependency.getImage().replace("${CASE_SERVER_IMAGE_VERSION}", version); + service.setName(name); + service.setImageName(imageName); + service.setExpose(dependency.getExpose()); + service.setLinks(dependency.getDepends_on()); + service.setStartScript(dependency.getStartScript()); + service.setHostname(dependency.getHostname()); + service.setDepends_on(dependency.getDepends_on()); + service.setEntrypoint(dependency.getEntrypoint()); + service.setHealthcheck(dependency.getHealthcheck()); + service.setEnvironment(dependency.getEnvironment()); + service.setRemoveOnExit(dependency.isRemoveOnExit()); + services.add(service); + }); + return services; + } } diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java index b3d261d5cacf..89483b44fcc1 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java @@ -17,61 +17,28 @@ package org.apache.skywalking.plugin.test.helper; -import com.google.common.collect.Lists; import freemarker.template.Configuration; import freemarker.template.TemplateException; import freemarker.template.TemplateExceptionHandler; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.StringWriter; import java.lang.invoke.MethodHandles; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; import java.util.Map; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.skywalking.plugin.test.helper.vo.DependencyComponent; -import org.apache.skywalking.plugin.test.helper.vo.DockerService; public class DockerComposeRunningGenerator extends AbstractRunningGenerator { - private static Logger logger = LogManager.getLogger(MethodHandles.lookup().lookupClass()); + private static final Logger logger = LogManager.getLogger(MethodHandles.lookup().lookupClass()); protected DockerComposeRunningGenerator() { } @Override public void generateAdditionFiles(IConfiguration configuration) { - Map root = new HashMap<>(); - root.put("agent_home", configuration.agentHome()); - root.put("scenario_home", configuration.scenarioHome()); - - root.put("scenario_name", configuration.scenarioName()); - root.put("scenario_version", configuration.scenarioVersion()); - root.put("entry_service", configuration.entryService()); - root.put("start_script", configuration.startScript()); - root.put("health_check", configuration.healthCheck()); - - root.put("expose", configuration.caseConfiguration().getExpose()); - root.put("hostname", configuration.caseConfiguration().getHostname()); - root.put("depends_on", configuration.caseConfiguration().getDepends_on()); - root.put("environments", configuration.caseConfiguration().getEnvironment()); - - root.put("docker_image_name", configuration.dockerImageName()); - root.put("docker_image_version", configuration.dockerImageVersion()); - root.put("docker_container_name", configuration.dockerContainerName()); - - root.put("network_name", configuration.dockerNetworkName()); - - ArrayList links = Lists.newArrayList(); - configuration.caseConfiguration().getDependencies().forEach((k, service) -> { - links.add(service.getHostname()); - }); - - root.put("links", links); - root.put("services", convertDockerServices(configuration.scenarioVersion(), configuration.caseConfiguration() - .getDependencies())); + final Map root = configuration.toMap(); Configuration cfg = new Configuration(Configuration.VERSION_2_3_28); try { @@ -91,55 +58,13 @@ public void generateAdditionFiles(IConfiguration configuration) { } } - protected List convertDockerServices(final String version, - Map componentMap) { - ArrayList services = Lists.newArrayList(); - componentMap.forEach((name, dependency) -> { - DockerService service = new DockerService(); - - String imageName = dependency.getImage().replace("${CASE_SERVER_IMAGE_VERSION}", version); - service.setName(name); - service.setImageName(imageName); - service.setExpose(dependency.getExpose()); - service.setLinks(dependency.getDepends_on()); - service.setStartScript(dependency.getStartScript()); - service.setHostname(dependency.getHostname()); - service.setDepends_on(dependency.getDepends_on()); - service.setEntrypoint(dependency.getEntrypoint()); - service.setHealthcheck(dependency.getHealthcheck()); - service.setEnvironment(dependency.getEnvironment()); - service.setRemoveOnExit(dependency.getRemoveOnExit()); - services.add(service); - }); - return services; - } - @Override public String runningScript(IConfiguration configuration) { - String docker_compose_file = configuration.outputDir() + File.separator + "docker-compose.yml"; - - Map root = new HashMap<>(); - root.put("scenario_name", configuration.scenarioName()); - root.put("scenario_home", configuration.scenarioHome()); - root.put("scenario_version", configuration.scenarioVersion()); - root.put("docker_compose_file", docker_compose_file); - root.put("build_id", configuration.dockerImageVersion()); - root.put("docker_container_name", configuration.dockerContainerName()); - - StringBuilder removeImagesScript = new StringBuilder(); - configuration.caseConfiguration().getDependencies().forEach((name, service) -> { - if (service.getRemoveOnExit()) { - removeImagesScript.append("docker rmi ") - .append(service.getImage().replace("${CASE_SERVER_IMAGE_VERSION}", configuration.scenarioVersion())) - .append(System.lineSeparator()); - } - }); - root.put("removeImagesScript", removeImagesScript.toString()); + final Map root = configuration.toMap(); - StringWriter out = null; + StringWriter out = new StringWriter(); try { - out = new StringWriter(); cfg.getTemplate("compose-start-script.template").process(root, out); } catch (Exception e) { logger.error("Failed to generate running script.", e); diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java index 1be71c4e504a..1b893a78efd4 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger; public class DockerContainerRunningGenerator extends AbstractRunningGenerator { - private static Logger logger = LogManager.getLogger(MethodHandles.lookup().lookupClass()); + private static final Logger logger = LogManager.getLogger(MethodHandles.lookup().lookupClass()); protected DockerContainerRunningGenerator() { } @@ -37,24 +37,10 @@ public void generateAdditionFiles(IConfiguration configuration) { @Override public String runningScript(IConfiguration configuration) { - Map root = new HashMap<>(); - root.put("agent_home", configuration.agentHome()); - root.put("scenario_home", configuration.scenarioHome()); - - root.put("scenario_name", configuration.scenarioName()); - root.put("scenario_version", configuration.scenarioVersion()); - root.put("health_check", configuration.healthCheck()); - root.put("start_script", configuration.startScript()); - root.put("catalina_opts", configuration.catalinaOpts()); - root.put("entry_service", configuration.entryService()); - root.put("test_framework", configuration.testFramework()); - root.put("docker_image_name", configuration.dockerImageName()); - root.put("docker_image_version", configuration.dockerImageVersion()); - root.put("docker_container_name", configuration.dockerContainerName()); - StringWriter out = null; + final Map root = configuration.toMap(); + final StringWriter out = new StringWriter(); try { - out = new StringWriter(); cfg.getTemplate("container-start-script.template").process(root, out); } catch (Exception e) { logger.error("Failed to generate running script.", e); diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/IConfiguration.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/IConfiguration.java index 2f44c3f66508..70d278fbbf5e 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/IConfiguration.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/IConfiguration.java @@ -19,6 +19,8 @@ import org.apache.skywalking.plugin.test.helper.vo.CaseConfiguration; +import java.util.Map; + public interface IConfiguration { String agentHome(); @@ -32,9 +34,6 @@ public interface IConfiguration { String scenarioVersion(); - @Deprecated - String testFramework(); - String healthCheck(); String startScript(); @@ -55,4 +54,7 @@ public interface IConfiguration { String outputDir(); + String jacocoHome(); + + Map toMap(); } diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/RunningType.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/RunningType.java index 1e95f381d53c..11533cc0a445 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/RunningType.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/RunningType.java @@ -18,5 +18,5 @@ package org.apache.skywalking.plugin.test.helper; public enum RunningType { - Container, DockerCompose; + Container, DockerCompose } diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/util/StringUtils.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/util/StringUtils.java deleted file mode 100644 index 02265d769afa..000000000000 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/util/StringUtils.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.skywalking.plugin.test.helper.util; - -public class StringUtils { - - public static boolean isBlank(String str) { - return str == null || str.length() == 0; - } -} diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java index cdccdf088843..274157694a37 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java @@ -17,14 +17,18 @@ package org.apache.skywalking.plugin.test.helper.vo; +import lombok.Getter; +import lombok.Setter; + import java.util.List; import java.util.Map; +@Getter +@Setter public class CaseConfiguration { private String type; private String entryService; private String healthCheck; - private String framework; private String hostname; private String startScript; private Map dependencies; @@ -33,100 +37,4 @@ public class CaseConfiguration { private List depends_on; private String runningMode; private String withPlugins; - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getEntryService() { - return entryService; - } - - public void setEntryService(String entryService) { - this.entryService = entryService; - } - - public String getHealthCheck() { - return healthCheck; - } - - public void setHealthCheck(String healthCheck) { - this.healthCheck = healthCheck; - } - - public String getFramework() { - return framework; - } - - public void setFramework(String framework) { - this.framework = framework; - } - - public String getHostname() { - return hostname; - } - - public void setHostname(String hostname) { - this.hostname = hostname; - } - - public String getStartScript() { - return startScript; - } - - public void setStartScript(String startScript) { - this.startScript = startScript; - } - - public Map getDependencies() { - return dependencies; - } - - public void setDependencies(Map dependencies) { - this.dependencies = dependencies; - } - - public List getEnvironment() { - return environment; - } - - public void setEnvironment(List environment) { - this.environment = environment; - } - - public List getExpose() { - return expose; - } - - public void setExpose(List expose) { - this.expose = expose; - } - - public List getDepends_on() { - return depends_on; - } - - public void setDepends_on(List depends_on) { - this.depends_on = depends_on; - } - - public String getRunningMode() { - return runningMode; - } - - public void setRunningMode(String runningMode) { - this.runningMode = runningMode; - } - - public String getWithPlugins() { - return withPlugins; - } - - public void setWithPlugins(String withPlugins) { - this.withPlugins = withPlugins; - } } diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java index 7ad97b5667af..c294f25b263b 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java @@ -17,8 +17,13 @@ package org.apache.skywalking.plugin.test.helper.vo; +import lombok.Getter; +import lombok.Setter; + import java.util.List; +@Getter +@Setter public class DependencyComponent { private String image; private String hostname; @@ -31,92 +36,4 @@ public class DependencyComponent { private List environment; private List depends_on; private List healthcheck; - - public String getImage() { - return image; - } - - public void setImage(String image) { - this.image = image; - } - - public String getHostname() { - return hostname; - } - - public void setHostname(String hostname) { - this.hostname = hostname; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public List getLinks() { - return links; - } - - public void setLinks(List links) { - this.links = links; - } - - public List getExpose() { - return expose; - } - - public void setExpose(List expose) { - this.expose = expose; - } - - public List getEntrypoint() { - return entrypoint; - } - - public void setEntrypoint(List entrypoint) { - this.entrypoint = entrypoint; - } - - public List getEnvironment() { - return environment; - } - - public void setEnvironment(List environment) { - this.environment = environment; - } - - public List getDepends_on() { - return depends_on; - } - - public void setDepends_on(List depends_on) { - this.depends_on = depends_on; - } - - public List getHealthcheck() { - return healthcheck; - } - - public void setHealthcheck(List healthcheck) { - this.healthcheck = healthcheck; - } - - public List getStartScript() { - return startScript; - } - - public void setStartScript(List startScript) { - this.startScript = startScript; - } - - public boolean getRemoveOnExit() { - return removeOnExit; - } - - public void setRemoveOnExit(final boolean removeOnExit) { - this.removeOnExit = removeOnExit; - } } diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java index 63bae60a5e92..269c2080efd4 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java @@ -17,8 +17,13 @@ package org.apache.skywalking.plugin.test.helper.vo; +import lombok.Getter; +import lombok.Setter; + import java.util.List; +@Getter +@Setter public class DockerService { private String name; private String imageName; @@ -31,92 +36,4 @@ public class DockerService { private List healthcheck; private List depends_on; private List environment; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getImageName() { - return imageName; - } - - public void setImageName(String imageName) { - this.imageName = imageName; - } - - public String getHostname() { - return hostname; - } - - public void setHostname(String hostname) { - this.hostname = hostname; - } - - public List getLinks() { - return links; - } - - public void setLinks(List links) { - this.links = links; - } - - public List getExpose() { - return expose; - } - - public void setExpose(List expose) { - this.expose = expose; - } - - public List getEntrypoint() { - return entrypoint; - } - - public void setEntrypoint(List entrypoint) { - this.entrypoint = entrypoint; - } - - public List getHealthcheck() { - return healthcheck; - } - - public void setHealthcheck(List healthcheck) { - this.healthcheck = healthcheck; - } - - public List getDepends_on() { - return depends_on; - } - - public void setDepends_on(List depends_on) { - this.depends_on = depends_on; - } - - public List getEnvironment() { - return environment; - } - - public void setEnvironment(List environment) { - this.environment = environment; - } - - public List getStartScript() { - return startScript; - } - - public void setStartScript(List startScript) { - this.startScript = startScript; - } - - public boolean getRemoveOnExit() { - return removeOnExit; - } - - public void setRemoveOnExit(final boolean removeOnExit) { - this.removeOnExit = removeOnExit; - } } diff --git a/test/plugin/runner-helper/src/main/resources/container-start-script.template b/test/plugin/runner-helper/src/main/resources/container-start-script.template index 8cacdd6bba51..5b410526c156 100644 --- a/test/plugin/runner-helper/src/main/resources/container-start-script.template +++ b/test/plugin/runner-helper/src/main/resources/container-start-script.template @@ -31,6 +31,7 @@ docker run \ -v ${agent_home}:/usr/local/skywalking/scenario/agent \ -v ${scenario_home}:/usr/local/skywalking/scenario \ + -v ${jacoco_home}:/jacoco \ ${docker_image_name}:${docker_image_version} 1>${scenario_home}/logs/container.log status="$?" diff --git a/test/plugin/runner-helper/src/main/resources/docker-compose.template b/test/plugin/runner-helper/src/main/resources/docker-compose.template index 3310dd14a6d5..35d53e8e78ad 100644 --- a/test/plugin/runner-helper/src/main/resources/docker-compose.template +++ b/test/plugin/runner-helper/src/main/resources/docker-compose.template @@ -48,6 +48,7 @@ services: volumes: - ${agent_home}:/usr/local/skywalking/scenario/agent - ${scenario_home}:/usr/local/skywalking/scenario + - ${jacoco_home}:/jacoco <#if depends_on??> depends_on: <#list depends_on as item> @@ -103,4 +104,4 @@ services: ${item} - \ No newline at end of file + diff --git a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java index a6fa582f1436..aaa3fa3a8277 100644 --- a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java +++ b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java @@ -48,12 +48,6 @@ public void setUp() throws FileNotFoundException, ConfigureFileNotFoundException configuration = new ConfigurationImpl(); } - @Test - public void testGenerateDockerCompose() { - String runningScript = dockerComposeRunningGenerator.runningScript(configuration); - // assertEquals(String.format("docker-compose -f %s/docker-compose.yml up", TARGET_DIR), runningScript); - } - @Test public void testGenerateAdditionalFile() throws GenerateFailedException { dockerComposeRunningGenerator.generateAdditionFiles(configuration); diff --git a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGeneratorTest.java b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGeneratorTest.java index dacfdf3b56ea..7c703f5005e7 100644 --- a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGeneratorTest.java +++ b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGeneratorTest.java @@ -41,7 +41,6 @@ public void setUp() { when(configuration.dockerImageName()).thenReturn("skyapm/agent-tomcat"); when(configuration.entryService()).thenReturn("http://localhost:8080/entryService"); when(configuration.healthCheck()).thenReturn("http://localhost:8080/healthCheck"); - when(configuration.testFramework()).thenReturn("http"); when(configuration.scenarioVersion()).thenReturn("4.3.2"); when(configuration.scenarioHome()).thenReturn("./scenario"); when(configuration.scenarioName()).thenReturn("test"); diff --git a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/vo/CaseIConfigurationTest.java b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/vo/CaseIConfigurationTest.java index cf0e8a1db55b..b4a62282eb1d 100644 --- a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/vo/CaseIConfigurationTest.java +++ b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/vo/CaseIConfigurationTest.java @@ -43,7 +43,6 @@ public void testReadCaseConfiguration() throws FileNotFoundException { CaseConfiguration caseConfiguration = yaml.loadAs(configurationFile, CaseConfiguration.class); assertNotNull(caseConfiguration); - assertThat(caseConfiguration.getFramework(), is("solrj")); assertThat(caseConfiguration.getDependencies().size(), is(1)); } } diff --git a/test/plugin/runner-helper/src/test/resources/configuration-test.yml b/test/plugin/runner-helper/src/test/resources/configuration-test.yml index 7b7e77c8c7cf..79dbb9cc1a90 100644 --- a/test/plugin/runner-helper/src/test/resources/configuration-test.yml +++ b/test/plugin/runner-helper/src/test/resources/configuration-test.yml @@ -17,7 +17,6 @@ type: jvm entryService: http://localhost:8080/solrj-7.x-scenario/case/solrj healthCheck: http://localhost:8080/solrj-7.x-scenario/heathcheck startScript: ./bin/startup.sh -framework: solrj runningMode: with_optional withPlugins: apm-gson-2.x-plugin-*.jar;apm-spring-cloud-gateway-2.x-plugin-*.jar environment: diff --git a/test/plugin/scenarios/activemq-scenario/configuration.yml b/test/plugin/scenarios/activemq-scenario/configuration.yml index bce707925a8f..ab22076a7807 100644 --- a/test/plugin/scenarios/activemq-scenario/configuration.yml +++ b/test/plugin/scenarios/activemq-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/activemq-scenario/case/activemq healthCheck: http://localhost:8080/activemq-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: activemq-scenario environment: - activemq.server=tcp://activemq-server:61616 dependencies: diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/configuration.yml b/test/plugin/scenarios/apm-toolkit-trace-scenario/configuration.yml index fc164d0346d5..59bdec800ddd 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/configuration.yml +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/apm-toolkit-trace-scenario/case/tool-kit healthCheck: http://localhost:8080/apm-toolkit-trace-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: apm-toolkit-trace diff --git a/test/plugin/scenarios/armeria-0.96minus-scenario/configuration.yml b/test/plugin/scenarios/armeria-0.96minus-scenario/configuration.yml index 7ff2750a1739..ff98ad4c2076 100644 --- a/test/plugin/scenarios/armeria-0.96minus-scenario/configuration.yml +++ b/test/plugin/scenarios/armeria-0.96minus-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: '"http://localhost:8080/greet/skywalking?q1=v1&chinese=%e4%b8%ad%e6%96%87"' healthCheck: http://localhost:8080/healthCheck startScript: ./bin/startup.sh -framework: Armeria diff --git a/test/plugin/scenarios/armeria-0.96plus-scenario/configuration.yml b/test/plugin/scenarios/armeria-0.96plus-scenario/configuration.yml index 75002bc76c75..86f0890ff34f 100644 --- a/test/plugin/scenarios/armeria-0.96plus-scenario/configuration.yml +++ b/test/plugin/scenarios/armeria-0.96plus-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/greet/skywalking healthCheck: http://localhost:8080/healthCheck startScript: ./bin/startup.sh -framework: Armeria diff --git a/test/plugin/scenarios/avro-scenario/configuration.yml b/test/plugin/scenarios/avro-scenario/configuration.yml index 18c829777acc..3f1e4d87dbe8 100644 --- a/test/plugin/scenarios/avro-scenario/configuration.yml +++ b/test/plugin/scenarios/avro-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/avro-scenario/case/avro-scenario healthCheck: http://localhost:8080/avro-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: avro-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/canal-scenario/configuration.yml b/test/plugin/scenarios/canal-scenario/configuration.yml index d976aa951521..16e3e71e5002 100644 --- a/test/plugin/scenarios/canal-scenario/configuration.yml +++ b/test/plugin/scenarios/canal-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/canal-scenario/case/canal-case healthCheck: http://localhost:8080/canal-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: canal environment: - CANAL_HOST=canal-server - CANAL_PORT=11111 @@ -40,4 +39,4 @@ dependencies: - canal.instance.dbUsername=root - canal.instance.dbPassword=000000 depends_on: - - mysql \ No newline at end of file + - mysql diff --git a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/configuration.yml b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/configuration.yml index b7fadbf1401a..2b82ea8eb6d0 100644 --- a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/configuration.yml +++ b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/cassandra-java-driver-3.x-scenario/case/cassandra healthCheck: http://localhost:8080/cassandra-java-driver-3.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: cassandra-java-driver-3.x-scenario environment: - cassandra.host=cassandra-server - cassandra.port=9042 diff --git a/test/plugin/scenarios/customize-scenario/configuration.yml b/test/plugin/scenarios/customize-scenario/configuration.yml index 928f2dc079d8..fa1716516559 100644 --- a/test/plugin/scenarios/customize-scenario/configuration.yml +++ b/test/plugin/scenarios/customize-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/customize-scenario/case/customize healthCheck: http://localhost:8080/customize-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: customize-scenario runningMode: with_optional withPlugins: apm-customize-enhance-plugin-*.jar diff --git a/test/plugin/scenarios/dubbo-2.5.x-scenario/configuration.yml b/test/plugin/scenarios/dubbo-2.5.x-scenario/configuration.yml index 17fda73adbb7..cf975f31d095 100644 --- a/test/plugin/scenarios/dubbo-2.5.x-scenario/configuration.yml +++ b/test/plugin/scenarios/dubbo-2.5.x-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/dubbo-2.5.x-scenario/case/dubbo healthCheck: http://localhost:8080/dubbo-2.5.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: dubbo diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/configuration.yml b/test/plugin/scenarios/dubbo-2.7.x-scenario/configuration.yml index ccad78d48139..98f24d2b5331 100644 --- a/test/plugin/scenarios/dubbo-2.7.x-scenario/configuration.yml +++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/dubbo-2.7.x-scenario/case/dubbo healthCheck: http://localhost:8080/dubbo-2.7.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: dubbo diff --git a/test/plugin/scenarios/ehcache-2.x-scenario/configuration.yml b/test/plugin/scenarios/ehcache-2.x-scenario/configuration.yml index 708a55dd9baa..050b37d4679a 100644 --- a/test/plugin/scenarios/ehcache-2.x-scenario/configuration.yml +++ b/test/plugin/scenarios/ehcache-2.x-scenario/configuration.yml @@ -17,4 +17,3 @@ type: tomcat entryService: http://localhost:8080/ehcache-2.x-scenario/case/ehcache healthCheck: http://localhost:8080/ehcache-2.x-scenario/healthCheck -framework: ehcache-2.x diff --git a/test/plugin/scenarios/elasticsearch-5.x-scenario/configuration.yml b/test/plugin/scenarios/elasticsearch-5.x-scenario/configuration.yml index 80c52b4ec42c..3cf26d41d1c8 100644 --- a/test/plugin/scenarios/elasticsearch-5.x-scenario/configuration.yml +++ b/test/plugin/scenarios/elasticsearch-5.x-scenario/configuration.yml @@ -16,7 +16,6 @@ type: jvm entryService: http://localhost:8080/elasticsearch-case/case/elasticsearch healthCheck: http://localhost:8080/elasticsearch-case/case/healthcheck startScript: ./bin/startup.sh -framework: elasticsearch environment: - elasticsearch.server=elasticsearch-server-5.x dependencies: diff --git a/test/plugin/scenarios/elasticsearch-6.x-scenario/configuration.yml b/test/plugin/scenarios/elasticsearch-6.x-scenario/configuration.yml index 387160b69739..bab1c5a875fa 100644 --- a/test/plugin/scenarios/elasticsearch-6.x-scenario/configuration.yml +++ b/test/plugin/scenarios/elasticsearch-6.x-scenario/configuration.yml @@ -16,7 +16,6 @@ type: jvm entryService: http://localhost:8080/elasticsearch-case/case/elasticsearch healthCheck: http://localhost:8080/elasticsearch-case/case/healthcheck startScript: ./bin/startup.sh -framework: elasticsearch environment: - elasticsearch.server=elasticsearch-server-6.x:9200 dependencies: diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/configuration.yml b/test/plugin/scenarios/elasticsearch-7.x-scenario/configuration.yml index 58deba4d9f65..853e67498ef1 100644 --- a/test/plugin/scenarios/elasticsearch-7.x-scenario/configuration.yml +++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/elasticsearch-case/case/elasticsearch healthCheck: http://localhost:8080/elasticsearch-case/case/healthCheck startScript: ./bin/startup.sh -framework: elasticsearch-7.x-scenario environment: - elasticsearch.server=elasticsearch-server-7.x:9200 dependencies: diff --git a/test/plugin/scenarios/feign-scenario/configuration.yml b/test/plugin/scenarios/feign-scenario/configuration.yml index 0cfc4f6eef8f..fa14c43ae471 100644 --- a/test/plugin/scenarios/feign-scenario/configuration.yml +++ b/test/plugin/scenarios/feign-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/feign-scenario/case/feign-scenario healthCheck: http://localhost:8080/feign-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: feign-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/finagle-17.10.x-scenario/configuration.yml b/test/plugin/scenarios/finagle-17.10.x-scenario/configuration.yml index a6b9e03f4431..1700b5c9e8d7 100644 --- a/test/plugin/scenarios/finagle-17.10.x-scenario/configuration.yml +++ b/test/plugin/scenarios/finagle-17.10.x-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/finagle-17.10.x-scenario/case/finagle healthCheck: http://localhost:8080/finagle-17.10.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: finagle-17.10.x-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/finagle-6.25.x-scenario/configuration.yml b/test/plugin/scenarios/finagle-6.25.x-scenario/configuration.yml index 9cc859af3329..6f6271d1dec3 100644 --- a/test/plugin/scenarios/finagle-6.25.x-scenario/configuration.yml +++ b/test/plugin/scenarios/finagle-6.25.x-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/finagle-6.25.x-scenario/case/finagle healthCheck: http://localhost:8080/finagle-6.25.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: finagle \ No newline at end of file diff --git a/test/plugin/scenarios/finagle-6.44.x-scenario/configuration.yml b/test/plugin/scenarios/finagle-6.44.x-scenario/configuration.yml index 311b45286a01..7ba9d32981eb 100644 --- a/test/plugin/scenarios/finagle-6.44.x-scenario/configuration.yml +++ b/test/plugin/scenarios/finagle-6.44.x-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/finagle-6.44.x-scenario/case/finagle healthCheck: http://localhost:8080/finagle-6.44.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: finagle-6.44.x-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/gateway-scenario/configuration.yml b/test/plugin/scenarios/gateway-scenario/configuration.yml index 40409eb2622b..86b0909f6c06 100644 --- a/test/plugin/scenarios/gateway-scenario/configuration.yml +++ b/test/plugin/scenarios/gateway-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/provider/b/testcase healthCheck: http://localhost:8080/provider/b/healthCheck startScript: ./bin/startup.sh -framework: spring-cloud-gateway runningMode: with_optional withPlugins: apm-spring-cloud-gateway-2.x-plugin-*.jar diff --git a/test/plugin/scenarios/grpc-scenario/configuration.yml b/test/plugin/scenarios/grpc-scenario/configuration.yml index 005282de9533..1740cb5a6410 100644 --- a/test/plugin/scenarios/grpc-scenario/configuration.yml +++ b/test/plugin/scenarios/grpc-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/grpc-scenario/case/grpc-scenario healthCheck: http://localhost:8080/grpc-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: grpc-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/gson-scenario/configuration.yml b/test/plugin/scenarios/gson-scenario/configuration.yml index aa64dc9cbf63..39e3a2b73bc3 100644 --- a/test/plugin/scenarios/gson-scenario/configuration.yml +++ b/test/plugin/scenarios/gson-scenario/configuration.yml @@ -18,8 +18,7 @@ type: jvm entryService: http://localhost:8080/gson-scenario/case/gson-scenario healthCheck: http://localhost:8080/gson-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: gson-scenario runningMode: with_optional withPlugins: apm-gson-2.x-plugin-*.jar environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/h2-scenario/configuration.yml b/test/plugin/scenarios/h2-scenario/configuration.yml index b109abb1f946..ea3d01adaf16 100644 --- a/test/plugin/scenarios/h2-scenario/configuration.yml +++ b/test/plugin/scenarios/h2-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/h2-scenario/case/h2-scenario healthCheck: http://localhost:8080/h2-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: h2-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/httpasyncclient-scenario/configuration.yml b/test/plugin/scenarios/httpasyncclient-scenario/configuration.yml index b6825e4c3570..f329ad0790e0 100644 --- a/test/plugin/scenarios/httpasyncclient-scenario/configuration.yml +++ b/test/plugin/scenarios/httpasyncclient-scenario/configuration.yml @@ -16,4 +16,3 @@ type: jvm entryService: http://localhost:8080/httpasyncclient/case/httpasyncclient healthCheck: http://localhost:8080/httpasyncclient/case/healthcheck startScript: ./bin/startup.sh -framework: httpasyncclient diff --git a/test/plugin/scenarios/httpclient-3.x-scenario/configuration.yml b/test/plugin/scenarios/httpclient-3.x-scenario/configuration.yml index 9c5db9c7b1d5..278d9ca09095 100644 --- a/test/plugin/scenarios/httpclient-3.x-scenario/configuration.yml +++ b/test/plugin/scenarios/httpclient-3.x-scenario/configuration.yml @@ -17,6 +17,5 @@ type: tomcat entryService: '"http://localhost:8080/httpclient-3.x-scenario/case/httpclient?q1=v1&chinese=%e4%b8%ad%e6%96%87"' healthCheck: http://localhost:8080/httpclient-3.x-scenario/healthCheck -framework: httpclient environment: - - CATALINA_OPTS="-Dskywalking.plugin.tomcat.collect_http_params=true" \ No newline at end of file + - CATALINA_OPTS="-Dskywalking.plugin.tomcat.collect_http_params=true" diff --git a/test/plugin/scenarios/httpclient-4.3.x-scenario/configuration.yml b/test/plugin/scenarios/httpclient-4.3.x-scenario/configuration.yml index 224363b29328..74c5803e6129 100644 --- a/test/plugin/scenarios/httpclient-4.3.x-scenario/configuration.yml +++ b/test/plugin/scenarios/httpclient-4.3.x-scenario/configuration.yml @@ -17,4 +17,3 @@ type: tomcat entryService: http://localhost:8080/httpclient-4.3.x-scenario/case/httpclient healthCheck: http://localhost:8080/httpclient-4.3.x-scenario/healthCheck -framework: httpclient diff --git a/test/plugin/scenarios/hystrix-scenario/configuration.yml b/test/plugin/scenarios/hystrix-scenario/configuration.yml index b944fb61c79c..cd84937ace07 100644 --- a/test/plugin/scenarios/hystrix-scenario/configuration.yml +++ b/test/plugin/scenarios/hystrix-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/hystrix-scenario/case/hystrix-scenario healthCheck: http://localhost:8080/hystrix-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: hystrix-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/jdk-http-scenario/configuration.yml b/test/plugin/scenarios/jdk-http-scenario/configuration.yml index 08f7c66a1fe4..ed0038d7206a 100644 --- a/test/plugin/scenarios/jdk-http-scenario/configuration.yml +++ b/test/plugin/scenarios/jdk-http-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/jdk-http-scenario/case/jdk-http-scenario healthCheck: http://localhost:8080/jdk-http-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: jdk-http-scenario runningMode: with_bootstrap withPlugins: apm-jdk-http-plugin-*.jar diff --git a/test/plugin/scenarios/jdk-threading-scenario/configuration.yml b/test/plugin/scenarios/jdk-threading-scenario/configuration.yml index b129cc2a1ff1..24fca86e6d3b 100644 --- a/test/plugin/scenarios/jdk-threading-scenario/configuration.yml +++ b/test/plugin/scenarios/jdk-threading-scenario/configuration.yml @@ -20,4 +20,3 @@ healthCheck: http://localhost:8080/healthCheck runningMode: with_bootstrap withPlugins: apm-jdk-threading-plugin-*.jar startScript: ./bin/startup.sh -framework: jdk-threading-scenario diff --git a/test/plugin/scenarios/jedis-scenario/configuration.yml b/test/plugin/scenarios/jedis-scenario/configuration.yml index 84df659e7573..c97a968f37e4 100644 --- a/test/plugin/scenarios/jedis-scenario/configuration.yml +++ b/test/plugin/scenarios/jedis-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/jedis-scenario/case/jedis-scenario healthCheck: http://localhost:8080/jedis-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: jedis-scenario environment: - REDIS_HOST=redis-server - REDIS_PORT=6379 diff --git a/test/plugin/scenarios/jetty-scenario/configuration.yml b/test/plugin/scenarios/jetty-scenario/configuration.yml index e0dc5770bca4..3da826dd2d73 100644 --- a/test/plugin/scenarios/jetty-scenario/configuration.yml +++ b/test/plugin/scenarios/jetty-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/jettyclient-case/case/jettyclient-case healthCheck: http://localhost:8080/jettyclient-case/case/healthCheck startScript: ./bin/startup.sh -framework: jettyclient diff --git a/test/plugin/scenarios/kafka-scenario/configuration.yml b/test/plugin/scenarios/kafka-scenario/configuration.yml index 40ea5351bcb6..5a74c2ba4209 100644 --- a/test/plugin/scenarios/kafka-scenario/configuration.yml +++ b/test/plugin/scenarios/kafka-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/kafka-scenario/case/kafka-case healthCheck: http://localhost:8080/kafka-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: kafka environment: - BOOTSTRAP_SERVERS=kafka-server:9092 depends_on: @@ -37,4 +36,4 @@ dependencies: - ALLOW_PLAINTEXT_LISTENER=yes - KAFKA_LISTENERS=PLAINTEXT://0.0.0.0:9092 depends_on: - - zookeeper-server \ No newline at end of file + - zookeeper-server diff --git a/test/plugin/scenarios/kotlin-coroutine-scenario/configuration.yml b/test/plugin/scenarios/kotlin-coroutine-scenario/configuration.yml index 157de2fc0e1b..533972895a4c 100644 --- a/test/plugin/scenarios/kotlin-coroutine-scenario/configuration.yml +++ b/test/plugin/scenarios/kotlin-coroutine-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/kotlin-coroutine-scenario/case/h2 healthCheck: http://localhost:8080/kotlin-coroutine-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: kt-coroutine runningMode: with_optional -withPlugins: apm-kotlin-coroutine-plugin-*.jar \ No newline at end of file +withPlugins: apm-kotlin-coroutine-plugin-*.jar diff --git a/test/plugin/scenarios/lettuce-scenario/configuration.yml b/test/plugin/scenarios/lettuce-scenario/configuration.yml index 248b5f2a45dc..39b38a17699f 100644 --- a/test/plugin/scenarios/lettuce-scenario/configuration.yml +++ b/test/plugin/scenarios/lettuce-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/lettuce-scenario/case/lettuce-case healthCheck: http://localhost:8080/lettuce-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: lettuce environment: - REDIS_SERVERS=redis-server:6379 depends_on: @@ -26,4 +25,4 @@ depends_on: dependencies: redis-server: image: redis:3.2.9-alpine - hostname: redis-server \ No newline at end of file + hostname: redis-server diff --git a/test/plugin/scenarios/mongodb-3.x-scenario/configuration.yml b/test/plugin/scenarios/mongodb-3.x-scenario/configuration.yml index 37c2626e658b..759169e0b2b1 100644 --- a/test/plugin/scenarios/mongodb-3.x-scenario/configuration.yml +++ b/test/plugin/scenarios/mongodb-3.x-scenario/configuration.yml @@ -18,8 +18,7 @@ type: jvm entryService: http://localhost:8080/mongodb-case/case/mongodb healthCheck: http://localhost:8080/mongodb-case/case/healthCheck startScript: ./bin/startup.sh -framework: mongodb-driver dependencies: mongodb-server: image: mongo:4.2 - hostname: mongodb-server \ No newline at end of file + hostname: mongodb-server diff --git a/test/plugin/scenarios/mysql-scenario/configuration.yml b/test/plugin/scenarios/mysql-scenario/configuration.yml index ed4bf0521094..0491700ede6a 100644 --- a/test/plugin/scenarios/mysql-scenario/configuration.yml +++ b/test/plugin/scenarios/mysql-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/mysql-scenario/case/mysql-scenario healthCheck: http://localhost:8080/mysql-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: mysql-scenario environment: depends_on: - mysql-server @@ -30,4 +29,4 @@ dependencies: - "3306" environment: - MYSQL_ROOT_PASSWORD=root - - MYSQL_DATABASE=test \ No newline at end of file + - MYSQL_DATABASE=test diff --git a/test/plugin/scenarios/netty-socketio-scenario/configuration.yml b/test/plugin/scenarios/netty-socketio-scenario/configuration.yml index b0503a5a0700..3c4a94076b75 100644 --- a/test/plugin/scenarios/netty-socketio-scenario/configuration.yml +++ b/test/plugin/scenarios/netty-socketio-scenario/configuration.yml @@ -17,4 +17,3 @@ type: tomcat entryService: http://localhost:8080/netty-socketio-scenario/case/netty-socketio healthCheck: http://localhost:8080/netty-socketio-scenario/healthCheck -framework: netty-socketio diff --git a/test/plugin/scenarios/okhttp-scenario/configuration.yml b/test/plugin/scenarios/okhttp-scenario/configuration.yml index fd67136a16bc..3aa0acaa680f 100644 --- a/test/plugin/scenarios/okhttp-scenario/configuration.yml +++ b/test/plugin/scenarios/okhttp-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/okhttp-case/case/okhttp-case healthCheck: http://localhost:8080/okhttp-case/case/healthCheck startScript: ./bin/startup.sh -framework: OKHttp3 \ No newline at end of file diff --git a/test/plugin/scenarios/oracle-scenario/configuration.yml b/test/plugin/scenarios/oracle-scenario/configuration.yml index 5e4f21737de4..0b112b9e7b93 100644 --- a/test/plugin/scenarios/oracle-scenario/configuration.yml +++ b/test/plugin/scenarios/oracle-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/oracle-scenario/case/oracle healthCheck: http://localhost:8080/oracle-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: oracle-scenario environment: - oracle.address=oracle-server:1521 - oracle.username=system diff --git a/test/plugin/scenarios/play-scenario/configuration.yml b/test/plugin/scenarios/play-scenario/configuration.yml index 939ff63677ab..5e4c9c3db29e 100644 --- a/test/plugin/scenarios/play-scenario/configuration.yml +++ b/test/plugin/scenarios/play-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:9000/play-scenario/case/play-scenario/projects/1 healthCheck: http://localhost:9000/play-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: PlayFramework diff --git a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/configuration.yml b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/configuration.yml index af43ee0dc898..5f5ab05af0f1 100644 --- a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/configuration.yml +++ b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/configuration.yml @@ -16,7 +16,6 @@ type: jvm entryService: http://localhost:8080/postgresql-scenario/case/postgres healthCheck: http://localhost:8080/postgresql-scenario/case/healthcheck startScript: ./bin/startup.sh -framework: PostgreSQL environment: - POSTGRESQL_SERVER=postgresql-server:5432 - POSTGRES_DB=postgres diff --git a/test/plugin/scenarios/postgresql-scenario/configuration.yml b/test/plugin/scenarios/postgresql-scenario/configuration.yml index 58af9fa637c4..8b582dbad767 100644 --- a/test/plugin/scenarios/postgresql-scenario/configuration.yml +++ b/test/plugin/scenarios/postgresql-scenario/configuration.yml @@ -17,7 +17,6 @@ type: jvm entryService: http://localhost:8080/postgresql-scenario/case/postgres healthCheck: http://localhost:8080/postgresql-scenario/case/healthcheck startScript: ./bin/startup.sh -framework: PostgreSQL environment: - POSTGRESQL_SERVER=postgresql-server:5432 - POSTGRES_DB=postgres diff --git a/test/plugin/scenarios/pulsar-scenario/configuration.yml b/test/plugin/scenarios/pulsar-scenario/configuration.yml index e6c0aac4b3b0..6a70cd35bb4f 100644 --- a/test/plugin/scenarios/pulsar-scenario/configuration.yml +++ b/test/plugin/scenarios/pulsar-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/pulsar-scenario/case/pulsar-case healthCheck: http://localhost:8080/pulsar-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: pulsar environment: - PULSAR_STANDALONE=pulsar-standalone:6650 depends_on: @@ -29,4 +28,4 @@ dependencies: hostname: pulsar-standalone startScript: ["bin/pulsar","standalone"] expose: - - 6650 \ No newline at end of file + - 6650 diff --git a/test/plugin/scenarios/rabbitmq-scenario/configuration.yml b/test/plugin/scenarios/rabbitmq-scenario/configuration.yml index d060a2a167b5..f622cf454807 100644 --- a/test/plugin/scenarios/rabbitmq-scenario/configuration.yml +++ b/test/plugin/scenarios/rabbitmq-scenario/configuration.yml @@ -16,7 +16,6 @@ type: jvm entryService: http://localhost:8080/rabbitmq-scenario/case/rabbitmq healthCheck: http://localhost:8080/rabbitmq-scenario/case/healthcheck startScript: ./bin/startup.sh -framework: rabbitmq environment: - RABBITMQ_HOST=rabbitmq-server dependencies: diff --git a/test/plugin/scenarios/redisson-scenario/configuration.yml b/test/plugin/scenarios/redisson-scenario/configuration.yml index e97e41618c05..4bc110c10971 100644 --- a/test/plugin/scenarios/redisson-scenario/configuration.yml +++ b/test/plugin/scenarios/redisson-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/redisson-scenario/case/redisson-case healthCheck: http://localhost:8080/redisson-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: redisson environment: - REDIS_SERVERS=redis-server:6379 depends_on: @@ -26,4 +25,4 @@ depends_on: dependencies: redis-server: image: redis:3.2.9-alpine - hostname: redis-server \ No newline at end of file + hostname: redis-server diff --git a/test/plugin/scenarios/resttemplate-4.x-scenario/configuration.yml b/test/plugin/scenarios/resttemplate-4.x-scenario/configuration.yml index 37bb74be4e51..f3a4c7719a22 100644 --- a/test/plugin/scenarios/resttemplate-4.x-scenario/configuration.yml +++ b/test/plugin/scenarios/resttemplate-4.x-scenario/configuration.yml @@ -15,4 +15,3 @@ type: tomcat entryService: http://localhost:8080/resttemplate-4.x-scenario/resttemplate/case/resttemplate healthCheck: http://localhost:8080/resttemplate-4.x-scenario/resttemplate/case/healthcheck -framework: resttemplate diff --git a/test/plugin/scenarios/servicecomb-0.x-scenario/configuration.yml b/test/plugin/scenarios/servicecomb-0.x-scenario/configuration.yml index 03b27769e100..57b58ecc0c9c 100644 --- a/test/plugin/scenarios/servicecomb-0.x-scenario/configuration.yml +++ b/test/plugin/scenarios/servicecomb-0.x-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/servicecomb/case healthCheck: http://localhost:8080/servicecomb/healthCheck startScript: ./bin/startup.sh -framework: servicecomb-0.x-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/configuration.yml b/test/plugin/scenarios/servicecomb-1.x-scenario/configuration.yml index 2d7fe8cd1a2b..8e06ef5487f5 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/configuration.yml +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/servicecomb/case healthCheck: http://localhost:8080/servicecomb/healthCheck startScript: ./bin/startup.sh -framework: servicecomb-1.x-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/configuration.yml b/test/plugin/scenarios/shardingsphere-3.x-scenario/configuration.yml index 1d9e4fcb7cd3..ea9b0e4a496d 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/configuration.yml +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/shardingsphere-3.x-scenario/case/execute healthCheck: http://localhost:8080/shardingsphere-3.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: ShardingSphere \ No newline at end of file diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/configuration.yml b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/configuration.yml index a952eeb0c5da..f7542015eaae 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/configuration.yml +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/shardingsphere-4.x-RC1-RC2-scenario/case/execute healthCheck: http://localhost:8080/shardingsphere-4.x-RC1-RC2-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: ShardingSphere \ No newline at end of file diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/configuration.yml b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/configuration.yml index 819898b4763b..ef75b6b3c8ee 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/configuration.yml +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/shardingsphere-4.x-RC3-scenario/case/execute healthCheck: http://localhost:8080/shardingsphere-4.x-RC3-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: ShardingSphere \ No newline at end of file diff --git a/test/plugin/scenarios/sofarpc-scenario/configuration.yml b/test/plugin/scenarios/sofarpc-scenario/configuration.yml index 9f6ae6e5ab06..38aa3e849826 100644 --- a/test/plugin/scenarios/sofarpc-scenario/configuration.yml +++ b/test/plugin/scenarios/sofarpc-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/sofarpc-scenario/case/sofarpc healthCheck: http://localhost:8080/sofarpc-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: sofarpc \ No newline at end of file diff --git a/test/plugin/scenarios/solrj-7.x-scenario/configuration.yml b/test/plugin/scenarios/solrj-7.x-scenario/configuration.yml index b6cc327cb65c..aea4ef8281d2 100644 --- a/test/plugin/scenarios/solrj-7.x-scenario/configuration.yml +++ b/test/plugin/scenarios/solrj-7.x-scenario/configuration.yml @@ -17,7 +17,6 @@ type: jvm entryService: http://localhost:8080/solrj-scenario/case/solrj healthCheck: http://localhost:8080/solrj-scenario/case/healthcheck startScript: ./bin/startup.sh -framework: solrj environment: - SOLR_SERVER=solr-server:8983 depends_on: diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/configuration.yml b/test/plugin/scenarios/spring-3.0.x-scenario/configuration.yml index c6a41dc13550..5480c93dbc0f 100644 --- a/test/plugin/scenarios/spring-3.0.x-scenario/configuration.yml +++ b/test/plugin/scenarios/spring-3.0.x-scenario/configuration.yml @@ -19,4 +19,3 @@ entryService: http://localhost:8080/spring-3.0.x-scenario/case/spring3 healthCheck: http://localhost:8080/spring-3.0.x-scenario/healthCheck runningMode: with_optional withPlugins: apm-spring-annotation-plugin-*.jar -framework: spring \ No newline at end of file diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/configuration.yml b/test/plugin/scenarios/spring-3.1.x-scenario/configuration.yml index cbe2958ccddd..5203dcca5284 100644 --- a/test/plugin/scenarios/spring-3.1.x-scenario/configuration.yml +++ b/test/plugin/scenarios/spring-3.1.x-scenario/configuration.yml @@ -19,6 +19,5 @@ entryService: '"http://localhost:8080/spring-3.1.x-scenario/case/resttemplate?q1 healthCheck: http://localhost:8080/spring-3.1.x-scenario/healthCheck runningMode: with_optional withPlugins: apm-spring-annotation-plugin-*.jar -framework: spring environment: - - CATALINA_OPTS="-Dskywalking.plugin.springmvc.collect_http_params=true" \ No newline at end of file + - CATALINA_OPTS="-Dskywalking.plugin.springmvc.collect_http_params=true" diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/configuration.yml b/test/plugin/scenarios/spring-4.1.x-scenario/configuration.yml index a60767e52b2b..7edff422f3c2 100644 --- a/test/plugin/scenarios/spring-4.1.x-scenario/configuration.yml +++ b/test/plugin/scenarios/spring-4.1.x-scenario/configuration.yml @@ -19,4 +19,3 @@ entryService: http://localhost:8080/spring-4.1.x-scenario/case/resttemplate healthCheck: http://localhost:8080/spring-4.1.x-scenario/healthCheck runningMode: with_optional withPlugins: apm-spring-annotation-plugin-*.jar -framework: spring \ No newline at end of file diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/configuration.yml b/test/plugin/scenarios/spring-4.3.x-scenario/configuration.yml index a2450407f4b8..2c9e72038d0f 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/configuration.yml +++ b/test/plugin/scenarios/spring-4.3.x-scenario/configuration.yml @@ -19,4 +19,3 @@ entryService: http://localhost:8080/spring-4.3.x-scenario/case/resttemplate healthCheck: http://localhost:8080/spring-4.3.x-scenario/healthCheck runningMode: with_optional withPlugins: apm-spring-annotation-plugin-*.jar -framework: spring \ No newline at end of file diff --git a/test/plugin/scenarios/spring-async-scenario/configuration.yml b/test/plugin/scenarios/spring-async-scenario/configuration.yml index cbb8f7ff19a6..2501dddd9a6a 100644 --- a/test/plugin/scenarios/spring-async-scenario/configuration.yml +++ b/test/plugin/scenarios/spring-async-scenario/configuration.yml @@ -17,4 +17,3 @@ type: tomcat entryService: http://localhost:8080/spring-async-scenario/case/spring-async healthCheck: http://localhost:8080/spring-async-scenario/case/healthCheck -framework: spring-async \ No newline at end of file diff --git a/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/configuration.yml b/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/configuration.yml index c4a5843d8814..8f417885c0d2 100644 --- a/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/configuration.yml +++ b/test/plugin/scenarios/spring-cloud-feign-1.1.x-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/spring-cloud-feign-1.1.x-scenario/case/spring-cloud-feign-1.1.x-scenario healthCheck: http://localhost:8080/spring-cloud-feign-1.1.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: spring-cloud-feign-1.1.x-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/configuration.yml b/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/configuration.yml index c8185c3eb1b1..f55e5ed9c8e3 100644 --- a/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/configuration.yml +++ b/test/plugin/scenarios/spring-cloud-feign-1.2.x-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/spring-cloud-feign-1.2.x-scenario/case/spring-cloud-feign-1.2.x-scenario healthCheck: http://localhost:8080/spring-cloud-feign-1.2.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: spring-cloud-feign-1.2.x-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/configuration.yml b/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/configuration.yml index 6cb82e1b22b9..b2f244ca6ae3 100644 --- a/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/configuration.yml +++ b/test/plugin/scenarios/spring-cloud-feign-2.x-scenario/configuration.yml @@ -18,6 +18,5 @@ type: jvm entryService: http://localhost:8080/spring-cloud-feign-2.x-scenario/case/spring-cloud-feign-2.x-scenario healthCheck: http://localhost:8080/spring-cloud-feign-2.x-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: spring-cloud-feign-2.x-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/spring-tx-scenario/configuration.yml b/test/plugin/scenarios/spring-tx-scenario/configuration.yml index 56a0b875e352..3aca6c04d810 100644 --- a/test/plugin/scenarios/spring-tx-scenario/configuration.yml +++ b/test/plugin/scenarios/spring-tx-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/spring-tx-scenario/case/spring-tx-case healthCheck: http://localhost:8080/spring-tx-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: spring-tx runningMode: with_optional withPlugins: apm-spring-tx-plugin-*.jar environment: @@ -31,4 +30,4 @@ dependencies: image: mysql:5.6 hostname: mysql environment: - - MYSQL_ROOT_PASSWORD=000000 \ No newline at end of file + - MYSQL_ROOT_PASSWORD=000000 diff --git a/test/plugin/scenarios/struts2.3-scenario/configuration.yml b/test/plugin/scenarios/struts2.3-scenario/configuration.yml index 99145cd51e32..47b6cf66a64c 100644 --- a/test/plugin/scenarios/struts2.3-scenario/configuration.yml +++ b/test/plugin/scenarios/struts2.3-scenario/configuration.yml @@ -17,6 +17,5 @@ type: tomcat entryService: http://localhost:8080/struts2.3-scenario/struts-scenario/case.action healthCheck: http://localhost:8080/struts2.3-scenario/case/healthCheck -framework: struts2.3-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/struts2.5-scenario/configuration.yml b/test/plugin/scenarios/struts2.5-scenario/configuration.yml index 7d5ccf44a9f8..803a5a696483 100644 --- a/test/plugin/scenarios/struts2.5-scenario/configuration.yml +++ b/test/plugin/scenarios/struts2.5-scenario/configuration.yml @@ -17,6 +17,5 @@ type: tomcat entryService: http://localhost:8080/struts2.5-scenario/struts-scenario/case.action healthCheck: http://localhost:8080/struts2.5-scenario/case/healthCheck -framework: struts2.5-scenario environment: -dependencies: \ No newline at end of file +dependencies: diff --git a/test/plugin/scenarios/undertow-scenario/configuration.yml b/test/plugin/scenarios/undertow-scenario/configuration.yml index 277dea571d46..3994b092f85c 100644 --- a/test/plugin/scenarios/undertow-scenario/configuration.yml +++ b/test/plugin/scenarios/undertow-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/undertow-scenario/case/undertow healthCheck: http://localhost:8080/undertow-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: undertow \ No newline at end of file diff --git a/test/plugin/scenarios/webflux-scenario/configuration.yml b/test/plugin/scenarios/webflux-scenario/configuration.yml index 61b83f26077c..bbf0b958e39b 100644 --- a/test/plugin/scenarios/webflux-scenario/configuration.yml +++ b/test/plugin/scenarios/webflux-scenario/configuration.yml @@ -18,4 +18,3 @@ type: jvm entryService: http://localhost:8080/projectA/testcase healthCheck: http://localhost:8080/projectA/healthCheck startScript: ./bin/startup.sh -framework: spring-webflux diff --git a/test/plugin/scenarios/zookeeper-scenario/configuration.yml b/test/plugin/scenarios/zookeeper-scenario/configuration.yml index 53aca6225e4e..229f26ff2c44 100644 --- a/test/plugin/scenarios/zookeeper-scenario/configuration.yml +++ b/test/plugin/scenarios/zookeeper-scenario/configuration.yml @@ -18,7 +18,6 @@ type: jvm entryService: http://localhost:8080/zookeeper-scenario/case/zookeeper-case healthCheck: http://localhost:8080/zookeeper-scenario/case/healthCheck startScript: ./bin/startup.sh -framework: zookeeper runningMode: with_optional withPlugins: apm-zookeeper-3.4.x-plugin-*.jar environment: @@ -28,4 +27,4 @@ depends_on: dependencies: zk-server: image: zookeeper:3.4.10 - hostname: zk-server \ No newline at end of file + hostname: zk-server diff --git a/test/untitled/pom.xml b/test/untitled/pom.xml deleted file mode 100644 index 841cccd1ee8e..000000000000 --- a/test/untitled/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - 4.0.0 - - org.example - untitled - 1.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-compiler-plugin - - 7 - 7 - - - - - - - \ No newline at end of file diff --git a/test/untitled/src/main/java/Main.java b/test/untitled/src/main/java/Main.java deleted file mode 100644 index 2bf8766557db..000000000000 --- a/test/untitled/src/main/java/Main.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import java.nio.charset.StandardCharsets; - -public class Main { - public static void main(String[] args) { - String abc = "3_b3JnLnNreXdha2luZy5hcG0udGVzdGNhc2UuZHViYm8uc2VydmljZXMuR3JlZXRTZXJ2aWNlSW1wbC5kb0J1c2luZXNzKCk=_0"; - System.out.println(abc.length()); - System.out.println(abc.getBytes(StandardCharsets.UTF_8).length); - } -} diff --git a/tools/coverage/report.sh b/tools/coverage/report.sh new file mode 100755 index 000000000000..8dd51356cb4c --- /dev/null +++ b/tools/coverage/report.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +# ---------------------------------------------------------------------------- +# 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. +# ---------------------------------------------------------------------------- + +set -ex + +JACOCO_HOME=${JACOCO_HOME:-test/jacoco} + +ls -alh "${JACOCO_HOME}" + +for exec_data in "${JACOCO_HOME}"/*.exec; do + exec_data=${exec_data/*\//} + exec_data=${exec_data/.exec/} + java -jar "${JACOCO_HOME}"/jacococli.jar report \ + --classfiles "${JACOCO_HOME}"/classes/"$exec_data" \ + --xml=/tmp/report-"$exec_data".xml \ + --html=/tmp/report-html-"$exec_data" \ + "${JACOCO_HOME}"/"$exec_data".exec +done + +bash <(curl -s https://codecov.io/bash) -X fix -f /tmp/report-*.xml