Count the coverage in E2E tests and Plugin tests (apache#4651)

hutaishi · Apr 15, 2020 · c11ad03 · c11ad03
1 parent 181bf13
commit c11ad03
Show file tree

Hide file tree

Showing 144 changed files with 703 additions and 1,710 deletions.
diff --git 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
@@ -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"
+        run: echo "Birds of a feather flock together"
diff --git 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"
+        run: echo "Singles Bar - Miyuki Nakajima"
diff --git 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
@@ -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"
+        run: echo "Just to make the GitHub merge button green"
diff --git 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
+          path: logs
diff --git 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
@@ -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
@@ -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
@@ -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 }}
+        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
@@ -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
+          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
@@ -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