update test scenario

Author: wang

.github/workflows/plugins-test.2.yaml

@@ -72,7 +72,6 @@ jobs:
           - spring-cloud-feign-1.2.x-scenario
           - spring-cloud-feign-2.x-scenario
           - spring-tx-scenario
-          - spring-retry-scenario
           - struts2.3-scenario
           - struts2.5-scenario
           - cxf-scenario

test/plugin/scenarios/spring-4.1.x-scenario/pom.xml

@@ -33,6 +33,7 @@
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <test.framework.version>4.1.0.RELEASE</test.framework.version>
         <test.framework>spring</test.framework>
+        <apm-toolkit-trace.version>9.4.0</apm-toolkit-trace.version>
     </properties>
 
     <name>skywalking-spring-4.1.x-scenario</name>
@@ -86,6 +87,26 @@
             <artifactId>log4j-core</artifactId>
             <version>2.8.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${test.framework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <version>${test.framework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+            <version>1.2.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.skywalking</groupId>
+            <artifactId>apm-toolkit-trace</artifactId>
+            <version>${apm-toolkit-trace.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/config/RetryConfig.java

@@ -0,0 +1,9 @@
+package test.apache.skywalking.apm.testcase.spring3.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.retry.annotation.EnableRetry;
+
+@Configuration
+@EnableRetry
+public class RetryConfig {
+}

test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java

@@ -18,7 +18,10 @@
 
 package test.apache.skywalking.apm.testcase.spring3.service;
 
+import org.apache.skywalking.apm.toolkit.trace.Trace;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
 import test.apache.skywalking.apm.testcase.spring3.component.TestComponentBean;
 import test.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean;
@@ -35,4 +38,10 @@ public void doSomeBusiness(String name) {
         componentBean.componentMethod(name);
         repositoryBean.doSomeStuff(name);
     }
+
+    // Test the class is enhanced by both SkyWalking and Spring AOP
+    @Retryable(value = Exception.class, backoff = @Backoff(delay = 1000, multiplier = 2))
+    @Trace
+    private void doRetry() {
+    }
 }