Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely (#444)

Author: kezhenxu94

Diff for: .github/actions/build/action.yml

@@ -44,19 +44,27 @@ runs:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-agent-test-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-maven-agent-test-
+    - uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: 17
     - name: Build SkyWalking Agent
       shell: bash
       run: |
         echo "::group::Build SkyWalking Agent"
         # Retry one more time due to frequent "maven connection reset"
-        ./mvnw --batch-mode clean package -Dmaven.test.skip || \
-        ./mvnw --batch-mode clean package -Dmaven.test.skip
+        ./mvnw -q --batch-mode clean package -Dmaven.test.skip || \
+        ./mvnw -q --batch-mode clean package -Dmaven.test.skip
         echo "::endgroup::"
     - uses: actions/upload-artifact@v2
       name: Upload Agent
       with:
         name: skywalking-agent
         path: skywalking-agent
+    - uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: 8
     - name: Build Docker Image
       shell: bash
       run: |

Diff for: .github/actions/run/action.yml

@@ -51,5 +51,11 @@ runs:
       shell: bash
       run: |
         echo "::group::Run Plugin Test ${{ inputs.test_case }}"
-        bash test/plugin/run.sh --image_version=${{ inputs.java_version }}-1.0.0 ${{ inputs.test_case }}
+        bash test/plugin/run.sh ${{ inputs.test_case }}
         echo "::endgroup::"
+    - uses: actions/upload-artifact@v2
+      name: Upload Agent
+      if: always()
+      with:
+        path: test/plugin/workspace
+        name: test-plugin-workspace-${{ inputs.test_case }}

Diff for: .github/workflows/ci.yaml

@@ -20,9 +20,6 @@ on:
   pull_request:
   schedule:
     - cron: '0 18 * * *'  # TimeZone: UTC 0
-  push:
-    branches:
-      - test/ci/*
 
 concurrency:
   group: ci-it-${{ github.event.pull_request.number || github.ref }}
@@ -51,10 +48,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu, macos, windows ]
-        java-version: [ 8 ]
-        include:
-          - os: ubuntu
-            java-version: 11
+        java-version: [ 17 ]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -67,15 +61,11 @@ jobs:
           restore-keys: ${{ runner.os }}-maven-ci-
       - uses: actions/setup-java@v2
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: ${{ matrix.java-version }}
       - name: Check Javaagent Plugin List
         run: tools/plugin/check-javaagent-plugin-list.sh
       - name: Install and Test
-        if: matrix.java-version == '8' && matrix.os != 'windows'
-        run: ./mvnw -q --batch-mode clean verify install javadoc:javadoc
-      - name: Install and Test
-        if: matrix.java-version == '11' || matrix.os == 'windows'
         run: ./mvnw -q --batch-mode clean verify install
 
   ci:

Diff for: .github/workflows/codeql.yaml

@@ -48,6 +48,11 @@ jobs:
       with:
         submodules: true
 
+    - uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: 17
+
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:

Diff for: .github/workflows/e2e.yaml

@@ -37,14 +37,19 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
+      - uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 17
       - name: Build SkyWalking agent docker image
         run: make build docker.java8
       - name: Build consumer & provider images
         shell: bash
         run: |
           echo "::group::Install SNAPSHOT apm-application-toolkit"
-          ./mvnw -DskipTests -N install
-          ./mvnw -f apm-application-toolkit -DskipTests -am install
+          ./mvnw -B -Dmaven.test.skip -N install
+          ./mvnw -B -pl :apm-test-tools -Dmaven.test.skip -am install
+          ./mvnw -B -f apm-application-toolkit -Dmaven.test.skip -am install
           echo "::endgroup::"
           echo "::group::"
           SW_VERSION=$(./mvnw -q -DforceStdout -N org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version)

Diff for: .github/workflows/plugins-jdk17-test.0.yaml

@@ -27,9 +27,6 @@ on:
       - 'test/plugin/**'
       - '**/pom.xml'
       - '!**.md'
-  push:
-    branches:
-      - test/ci/*
 
 concurrency:
   group: plugins-jdk17-${{ github.event.pull_request.number || github.ref }}

Diff for: .github/workflows/plugins-jdk17-test.1.yaml

@@ -0,0 +1,70 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Test
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/plugins-*.yaml'
+      - 'apm-application-toolkit/**'
+      - 'apm-commons/**'
+      - 'apm-protocol/**'
+      - 'apm-sniffer/**'
+      - 'test/plugin/**'
+      - '**/pom.xml'
+      - '!**.md'
+
+concurrency:
+  group: plugins-jdk17-1-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Build
+        uses: ./.github/actions/build
+        with:
+          base_image_java: eclipse-temurin:17-jdk
+          base_image_tomcat: tomcat:10.1-jdk17-temurin
+
+  test:
+    needs: [ build ]
+    name: ${{ matrix.case }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+    strategy:
+      matrix:
+        case:
+          - spring-6.x-scenario
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Run Test
+        uses: ./.github/actions/run
+        with:
+          test_case: ${{ matrix.case }}

Diff for: .github/workflows/plugins-test.0.yaml

@@ -27,9 +27,6 @@ on:
       - 'test/plugin/**'
       - '**/pom.xml'
       - '!**.md'
-  push:
-    branches:
-      - test/ci/*
 
 concurrency:
   group: plugins-0-${{ github.event.pull_request.number || github.ref }}
@@ -95,7 +92,7 @@ jobs:
           submodules: true
       - uses: actions/setup-java@v2
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: 8
       - name: Run Plugin Test
         uses: ./.github/actions/run

Diff for: .github/workflows/plugins-test.1.yaml

@@ -27,9 +27,6 @@ on:
       - 'test/plugin/**'
       - '**/pom.xml'
       - '!**.md'
-  push:
-    branches:
-      - test/ci/*
 
 concurrency:
   group: plugins-1-${{ github.event.pull_request.number || github.ref }}
@@ -87,7 +84,7 @@ jobs:
           submodules: true
       - uses: actions/setup-java@v2
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: 8
       - name: Run Plugin Test
         uses: ./.github/actions/run

Diff for: .github/workflows/plugins-test.2.yaml

@@ -27,9 +27,6 @@ on:
       - 'test/plugin/**'
       - '**/pom.xml'
       - '!**.md'
-  push:
-    branches:
-      - test/ci/*
 
 concurrency:
   group: plugins-2-${{ github.event.pull_request.number || github.ref }}
@@ -86,7 +83,7 @@ jobs:
           submodules: true
       - uses: actions/setup-java@v2
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: 8
       - name: Run Plugin Test
         uses: ./.github/actions/run

Diff for: .github/workflows/plugins-test.3.yaml

@@ -27,9 +27,6 @@ on:
       - 'test/plugin/**'
       - '**/pom.xml'
       - '!**.md'
-  push:
-    branches:
-      - test/ci/*
 
 concurrency:
   group: plugins-3-${{ github.event.pull_request.number || github.ref }}
@@ -114,7 +111,7 @@ jobs:
           submodules: true
       - uses: actions/setup-java@v2
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: 8
       - name: Install Oracle Libs
         if: matrix.case == 'oracle-scenario'

Diff for: .github/workflows/plugins-tomcat10-test.0.yaml

@@ -27,9 +27,6 @@ on:
       - 'test/plugin/**'
       - '**/pom.xml'
       - '!**.md'
-  push:
-    branches:
-      - test/ci/*
 
 concurrency:
   group: plugins-tomcat10-${{ github.event.pull_request.number || github.ref }}
@@ -64,7 +61,7 @@ jobs:
           submodules: true
       - uses: actions/setup-java@v2
         with:
-          distribution: adopt
+          distribution: temurin
           java-version: 8
       - name: Run Plugin Test
         uses: ./.github/actions/run

Diff for: .licenserc.yaml

@@ -22,6 +22,7 @@ header:
     copyright-owner: Apache Software Foundation
 
   paths-ignore:
+    - 'org.mockito.plugins.MockMaker'
     - '.github/PULL_REQUEST_TEMPLATE'
     - '**/.gitignore'
     - '.gitmodules'

Diff for: CHANGES.md

@@ -6,7 +6,10 @@ Release Notes.
 ------------------
 
 * Enhance lettuce plugin to adopt uniform tags.
-* Expose complete Tracing APIs in the tracing toolkit
+* Expose complete Tracing APIs in the tracing toolkit.
+* Add plugin to trace Spring 6 and Resttemplate 6.
+* Move the baseline to JDK 17 for development, the runtime baseline is still Java 8 compatible.
+* Remove Powermock entirely from the test cases.
 
 #### Documentation
 * Update docs of Tracing APIs, reorganize the API docs into six parts

Diff for: apm-application-toolkit/apm-toolkit-micrometer-registry/pom.xml

@@ -44,5 +44,11 @@
             <artifactId>micrometer-core</artifactId>
             <version>${micrometer-core.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.skywalking</groupId>
+            <artifactId>apm-test-tools</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

Diff for: apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingCounterTest.java

@@ -18,39 +18,36 @@
 
 package org.apache.skywalking.apm.meter.micrometer;
 
-import io.micrometer.core.instrument.Counter;
+import java.util.Arrays;
+import org.apache.skywalking.apm.agent.test.helper.FieldGetter;
 import org.junit.Assert;
 import org.junit.Test;
-import org.powermock.reflect.Whitebox;
-
-import java.util.Arrays;
+import io.micrometer.core.instrument.Counter;
 
 public class SkywalkingCounterTest {
 
     @Test
-    public void testCounter() {
+    public void testCounter() throws IllegalAccessException, NoSuchFieldException {
         // Creating a simplified micrometer counter
         final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry();
         Counter counter = registry.counter("test_counter", "skywalking", "test");
 
         // Check Skywalking counter type
         Assert.assertTrue(counter instanceof SkywalkingCounter);
         final SkywalkingCounter skywalkingCounter = (SkywalkingCounter) counter;
-        final org.apache.skywalking.apm.toolkit.meter.Counter realCounter =
-            Whitebox.getInternalState(skywalkingCounter, "counter");
+        final org.apache.skywalking.apm.toolkit.meter.Counter realCounter = FieldGetter.getValue(skywalkingCounter, "counter");
         Assert.assertNotNull(realCounter);
     }
 
     @Test
-    public void testRateCounter() {
+    public void testRateCounter() throws IllegalAccessException, NoSuchFieldException {
         final SkywalkingMeterRegistry registry = new SkywalkingMeterRegistry(new SkywalkingConfig(Arrays.asList("test_rate_counter")));
         final Counter counter = registry.counter("test_rate_counter", "skywalking", "test");
 
         // Check Skywalking counter type
         Assert.assertTrue(counter instanceof SkywalkingCounter);
         final SkywalkingCounter skywalkingCounter = (SkywalkingCounter) counter;
-        final org.apache.skywalking.apm.toolkit.meter.Counter realCounter =
-            Whitebox.getInternalState(skywalkingCounter, "counter");
+        final org.apache.skywalking.apm.toolkit.meter.Counter realCounter = FieldGetter.getValue(skywalkingCounter, "counter");
         Assert.assertNotNull(realCounter);
     }
 }

Diff for: apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingMeterRegistryTest.java

@@ -88,7 +88,6 @@ private void testNewMeter(String meterName, Meter.Type type, Statistic statistic
             .register(registry);
     }
 
-
     /**
      * Working on {@link io.micrometer.core.instrument.Gauge} check
      */

Diff for: apm-commons/apm-datacarrier/pom.xml

@@ -33,6 +33,12 @@
             <artifactId>jmh-generator-annprocess</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>uk.org.webcompere</groupId>
+            <artifactId>system-stubs-junit4</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>