This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 4dfc1e85b5 Fix method name missing in
spring-plugins:scheduled-annotation-plugin with spring 6.1.x (#691)
4dfc1e85b5 is described below
commit 4dfc1e85b56e75a1bf2bae11d34d8c0fe234bed0
Author: Chen Ziyan <clairelove.c...@gmail.com>
AuthorDate: Tue May 14 20:21:27 2024 +0800
Fix method name missing in spring-plugins:scheduled-annotation-plugin with
spring 6.1.x (#691)
---
.github/workflows/plugins-jdk17-test.1.yaml | 1 +
.github/workflows/plugins-test.3.yaml | 2 +-
CHANGES.md | 1 +
.../ScheduledMethodInterceptorInstrumentation.java | 13 +++++++
.../service-agent/java-agent/Supported-list.md | 2 +-
.../client/java/controller/MessageService.java | 43 +++++++++++++++-------
.../config/expectedData.yaml | 10 ++---
.../configuration.yml | 4 +-
.../pom.xml | 8 ++--
.../scheduled/controller/CaseController.java | 0
.../spring/scheduled/job/SchedulingJob.java | 2 +-
.../src/main/resources/log4j2.xml | 0
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 0
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../support-version.list | 3 +-
.../config/expectedData.yaml | 10 ++---
.../configuration.yml | 4 +-
.../pom.xml | 28 ++++----------
.../scheduled/controller/CaseController.java | 0
.../spring/scheduled/job/SchedulingJob.java | 2 +-
.../src/main/resources/log4j2.xml | 0
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 0
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../support-version.list | 11 +-----
24 files changed, 81 insertions(+), 67 deletions(-)
diff --git a/.github/workflows/plugins-jdk17-test.1.yaml
b/.github/workflows/plugins-jdk17-test.1.yaml
index 61bb8fa75a..949e69cfa1 100644
--- a/.github/workflows/plugins-jdk17-test.1.yaml
+++ b/.github/workflows/plugins-jdk17-test.1.yaml
@@ -62,6 +62,7 @@ jobs:
- activemq-artemis-2.x-scenario
- c3p0-0.9.0.x-0.9.1.x-scenario
- c3p0-0.9.2.x-0.10.x-scenario
+ - spring-scheduled-6.x-scenario
steps:
- uses: actions/checkout@v2
with:
diff --git a/.github/workflows/plugins-test.3.yaml
b/.github/workflows/plugins-test.3.yaml
index 7451dcf4b5..e687161731 100644
--- a/.github/workflows/plugins-test.3.yaml
+++ b/.github/workflows/plugins-test.3.yaml
@@ -81,7 +81,7 @@ jobs:
- spring-kafka-1.3.x-scenario
- spring-kafka-2.2.x-scenario
- spring-kafka-2.3.x-scenario
- - spring-scheduled-scenario
+ - spring-scheduled-3.x-5.x-scenario
- elasticjob-2.x-scenario
- quartz-scheduler-2.x-scenario
- xxl-job-2.2.0-scenario
diff --git a/CHANGES.md b/CHANGES.md
index 6b6c759ae5..0340de503d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Release Notes.
* Use a daemon thread to flush logs.
* Fix typos in `URLParser`.
* Add support for `Derby`/`Sybase`/`SQLite`/`DB2`/`OceanBase` jdbc url format
in `URLParser`.
+* Optimize spring-plugins:scheduled-annotation-plugin compatibility about
Spring 6.1.x support.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/213?closed=1)
diff --git
a/apm-sniffer/apm-sdk-plugin/spring-plugins/scheduled-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/scheduled/define/ScheduledMethodInterceptorInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/spring-plugins/scheduled-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/scheduled/define/ScheduledMethodInterceptorInstrumentation.java
index 2aacd3720b..44b36778bb 100644
---
a/apm-sniffer/apm-sdk-plugin/spring-plugins/scheduled-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/scheduled/define/ScheduledMethodInterceptorInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/spring-plugins/scheduled-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/scheduled/define/ScheduledMethodInterceptorInstrumentation.java
@@ -82,6 +82,19 @@ public class ScheduledMethodInterceptorInstrumentation
extends ClassInstanceMeth
public String getConstructorInterceptor() {
return CONSTRUCTOR_WITH_STRING_INTERCEPTOR_CLASS;
}
+ },
+ new ConstructorInterceptPoint() {
+ @Override
+ public ElementMatcher<MethodDescription>
getConstructorMatcher() {
+ return takesArguments(4)
+ .and(takesArgument(0, Object.class))
+ .and(takesArgument(1, Method.class));
+ }
+
+ @Override
+ public String getConstructorInterceptor() {
+ return CONSTRUCTOR_WITH_METHOD_INTERCEPTOR_CLASS;
+ }
}
};
}
diff --git a/docs/en/setup/service-agent/java-agent/Supported-list.md
b/docs/en/setup/service-agent/java-agent/Supported-list.md
index 9b21ea11d8..1fa2672282 100644
--- a/docs/en/setup/service-agent/java-agent/Supported-list.md
+++ b/docs/en/setup/service-agent/java-agent/Supported-list.md
@@ -120,7 +120,7 @@ metrics based on the tracing data.
* Scheduler
* [Elastic Job](https://github.com/elasticjob/elastic-job) 2.x
* [Apache
ShardingSphere-Elasticjob](https://github.com/apache/shardingsphere-elasticjob)
3.x
- * [Spring @Scheduled](https://github.com/spring-projects/spring-framework)
3.1+
+ * [Spring @Scheduled](https://github.com/spring-projects/spring-framework)
3.1.x -> 6.1.x
* [Quartz Scheduler](https://github.com/quartz-scheduler/quartz) 2.x
(Optional²)
* [XXL Job](https://github.com/xuxueli/xxl-job) 2.x
* OpenTracing community supported
diff --git
a/test/plugin/scenarios/rocketmq-5-grpc-scenario/src/main/java/test/apache/skywalking/apm/testcase/rocketmq/client/java/controller/MessageService.java
b/test/plugin/scenarios/rocketmq-5-grpc-scenario/src/main/java/test/apache/skywalking/apm/testcase/rocketmq/client/java/controller/MessageService.java
index 0c87f66981..f7d4dc3c9b 100644
---
a/test/plugin/scenarios/rocketmq-5-grpc-scenario/src/main/java/test/apache/skywalking/apm/testcase/rocketmq/client/java/controller/MessageService.java
+++
b/test/plugin/scenarios/rocketmq-5-grpc-scenario/src/main/java/test/apache/skywalking/apm/testcase/rocketmq/client/java/controller/MessageService.java
@@ -87,8 +87,8 @@ public class MessageService {
.build();
try {
CompletableFuture<SendReceipt> future =
producer.sendAsync(message);
- future.join();
- log.info("Send async message successfully");
+ SendReceipt sendReceipt = future.join();
+ log.info("Send async message successfully, messageId={}",
sendReceipt.getMessageId());
} catch (Throwable t) {
log.error("Failed to send message", t);
}
@@ -142,17 +142,34 @@ public class MessageService {
.build();
Duration invisibleDuration = Duration.ofSeconds(duration);
- final List<MessageView> messages = consumer.receive(maxMessageNum,
invisibleDuration);
- messages.forEach(messageView -> {
- log.info("Received message: {}", messageView);
- });
- for (MessageView msg : messages) {
- final MessageId messageId = msg.getMessageId();
- try {
- consumer.ack(msg);
- log.info("Message is acknowledged successfully,
messageId={}", messageId);
- } catch (Throwable t) {
- log.error("Message is failed to be acknowledged,
messageId={}", messageId, t);
+ int counter = 0;
+ int checkCounter = 0;
+ while (true) {
+ final List<MessageView> messages =
consumer.receive(maxMessageNum, invisibleDuration);
+ messages.forEach(messageView -> {
+ log.info("Received message: {}", messageView);
+ });
+ boolean finishFlag = false;
+ for (MessageView msg : messages) {
+ final MessageId messageId = msg.getMessageId();
+ try {
+ consumer.ack(msg);
+ log.info("Message is acknowledged successfully,
messageId={}", messageId);
+ counter++;
+ if (counter >= 2) {
+ finishFlag = true;
+ }
+ } catch (Throwable t) {
+ log.error("Message is failed to be acknowledged,
messageId={}", messageId, t);
+ }
+ }
+ checkCounter++;
+ if (finishFlag) {
+ break;
+ }
+ if (checkCounter >= 3) {
+ log.error("Message is failed to receive after 3 attempts");
+ break;
}
}
} catch (Exception e) {
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/config/expectedData.yaml
similarity index 90%
copy from
test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml
copy to
test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/config/expectedData.yaml
index 1c5f45888c..285bb6bd3e 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml
+++
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/config/expectedData.yaml
@@ -14,12 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
segmentItems:
-- serviceName: spring-scheduled-scenario
+- serviceName: spring-scheduled-3.x-5.x-scenario
segmentSize: ge 2
segments:
- segmentId: not null
spans:
- - operationName: GET:/spring-scheduled-scenario/case/call
+ - operationName: GET:/spring-scheduled-3.x-5.x-scenario/case/call
parentSpanId: -1
spanId: 0
spanLayer: Http
@@ -31,14 +31,14 @@ segmentItems:
peer: ''
skipAnalysis: false
tags:
- - {key: url, value:
'http://localhost:8080/spring-scheduled-scenario/case/call'}
+ - {key: url, value:
'http://localhost:8080/spring-scheduled-3.x-5.x-scenario/case/call'}
- {key: http.method, value: GET}
- {key: http.status_code, value: '200'}
refs:
- {parentEndpoint:
SpringScheduled/org.apache.skywalking.apm.testcase.spring.scheduled.job.SchedulingJob.work,
networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1,
parentTraceSegmentId: not null, parentServiceInstance: not null, parentService:
not null, traceId: not null}
- segmentId: not null
spans:
- - operationName: /spring-scheduled-scenario/case/call
+ - operationName: /spring-scheduled-3.x-5.x-scenario/case/call
parentSpanId: 0
spanId: 1
spanLayer: Http
@@ -51,7 +51,7 @@ segmentItems:
skipAnalysis: false
tags:
- {key: http.method, value: GET}
- - {key: url, value:
'http://localhost:8080/spring-scheduled-scenario/case/call'}
+ - {key: url, value:
'http://localhost:8080/spring-scheduled-3.x-5.x-scenario/case/call'}
- {key: http.status_code, value: '200'}
- operationName:
SpringScheduled/org.apache.skywalking.apm.testcase.spring.scheduled.job.SchedulingJob.work
parentSpanId: -1
diff --git a/test/plugin/scenarios/spring-scheduled-scenario/configuration.yml
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/configuration.yml
similarity index 82%
copy from test/plugin/scenarios/spring-scheduled-scenario/configuration.yml
copy to
test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/configuration.yml
index 93a92b6b00..61cc0a3fb3 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/configuration.yml
+++ b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/configuration.yml
@@ -15,5 +15,5 @@
# limitations under the License.
type: tomcat
-entryService: http://localhost:8080/spring-scheduled-scenario/case/healthCheck
-healthCheck: http://localhost:8080/spring-scheduled-scenario/case/healthCheck
\ No newline at end of file
+entryService:
http://localhost:8080/spring-scheduled-3.x-5.x-scenario/case/healthCheck
+healthCheck:
http://localhost:8080/spring-scheduled-3.x-5.x-scenario/case/healthCheck
\ No newline at end of file
diff --git a/test/plugin/scenarios/spring-scheduled-scenario/pom.xml
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/pom.xml
similarity index 94%
copy from test/plugin/scenarios/spring-scheduled-scenario/pom.xml
copy to test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/pom.xml
index 10f388f6ac..8dd8e29cbe 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/pom.xml
+++ b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/pom.xml
@@ -21,13 +21,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.skywalking.apm.testcase</groupId>
- <artifactId>spring-scheduled-scenario</artifactId>
+ <artifactId>spring-scheduled-3.x-5.x-scenario</artifactId>
<version>1.0.0</version>
<packaging>war</packaging>
<modelVersion>4.0.0</modelVersion>
- <name>skywalking-spring-scheduled-scenario</name>
+ <name>skywalking-spring-scheduled-3.x-5.x-scenario</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -92,7 +92,7 @@
</dependencies>
<build>
- <finalName>spring-scheduled-scenario</finalName>
+ <finalName>spring-scheduled-3.x-5.x-scenario</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -109,7 +109,7 @@
<version>2.1</version>
<configuration>
<port>8080</port>
- <path>/spring-scheduled-scenario</path>
+ <path>/spring-scheduled-3.x-5.x-scenario</path>
<uriEncoding>UTF-8</uriEncoding>
<server>tomcat7</server>
</configuration>
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
similarity index 100%
copy from
test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
copy to
test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
similarity index 96%
copy from
test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
copy to
test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
index dc36b167e6..c943af8a56 100644
---
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
+++
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
@@ -41,7 +41,7 @@ public class SchedulingJob {
public void work() throws IOException {
LOGGER.info("work job running!");
- Request request = new
Request.Builder().url("http://localhost:8080/spring-scheduled-scenario/case/call";).build();
+ Request request = new
Request.Builder().url("http://localhost:8080/spring-scheduled-3.x-5.x-scenario/case/call";).build();
Response response = CLIENT.newCall(request).execute();
response.body().close();
}
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/resources/log4j2.xml
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/resources/log4j2.xml
similarity index 100%
copy from
test/plugin/scenarios/spring-scheduled-scenario/src/main/resources/log4j2.xml
copy to
test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/resources/log4j2.xml
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
similarity index 100%
copy from
test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
copy to
test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/web.xml
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/webapp/WEB-INF/web.xml
similarity index 94%
copy from
test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/web.xml
copy to
test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/webapp/WEB-INF/web.xml
index 97967a024e..041c8b4f29 100644
---
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/web.xml
+++
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/src/main/webapp/WEB-INF/web.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
version="3.1">
- <display-name>skywalking-spring-scheduled-scenario</display-name>
+ <display-name>skywalking-spring-scheduled-3.x-5.x-scenario</display-name>
<servlet>
<servlet-name>spring-mvc</servlet-name>
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/support-version.list
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/support-version.list
similarity index 97%
copy from test/plugin/scenarios/spring-scheduled-scenario/support-version.list
copy to
test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/support-version.list
index 78ff603b37..9685fe8ec3 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/support-version.list
+++
b/test/plugin/scenarios/spring-scheduled-3.x-5.x-scenario/support-version.list
@@ -22,4 +22,5 @@
4.3.28.RELEASE
5.0.18.RELEASE
5.1.17.RELEASE
-5.2.8.RELEASE
+5.2.25.RELEASE
+5.3.34
\ No newline at end of file
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/config/expectedData.yaml
similarity index 91%
rename from
test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml
rename to
test/plugin/scenarios/spring-scheduled-6.x-scenario/config/expectedData.yaml
index 1c5f45888c..f0a297781f 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/config/expectedData.yaml
+++
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/config/expectedData.yaml
@@ -14,12 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
segmentItems:
-- serviceName: spring-scheduled-scenario
+- serviceName: spring-scheduled-6.x-scenario
segmentSize: ge 2
segments:
- segmentId: not null
spans:
- - operationName: GET:/spring-scheduled-scenario/case/call
+ - operationName: GET:/spring-scheduled-6.x-scenario/case/call
parentSpanId: -1
spanId: 0
spanLayer: Http
@@ -31,14 +31,14 @@ segmentItems:
peer: ''
skipAnalysis: false
tags:
- - {key: url, value:
'http://localhost:8080/spring-scheduled-scenario/case/call'}
+ - {key: url, value:
'http://localhost:8080/spring-scheduled-6.x-scenario/case/call'}
- {key: http.method, value: GET}
- {key: http.status_code, value: '200'}
refs:
- {parentEndpoint:
SpringScheduled/org.apache.skywalking.apm.testcase.spring.scheduled.job.SchedulingJob.work,
networkAddress: 'localhost:8080', refType: CrossProcess, parentSpanId: 1,
parentTraceSegmentId: not null, parentServiceInstance: not null, parentService:
not null, traceId: not null}
- segmentId: not null
spans:
- - operationName: /spring-scheduled-scenario/case/call
+ - operationName: /spring-scheduled-6.x-scenario/case/call
parentSpanId: 0
spanId: 1
spanLayer: Http
@@ -51,7 +51,7 @@ segmentItems:
skipAnalysis: false
tags:
- {key: http.method, value: GET}
- - {key: url, value:
'http://localhost:8080/spring-scheduled-scenario/case/call'}
+ - {key: url, value:
'http://localhost:8080/spring-scheduled-6.x-scenario/case/call'}
- {key: http.status_code, value: '200'}
- operationName:
SpringScheduled/org.apache.skywalking.apm.testcase.spring.scheduled.job.SchedulingJob.work
parentSpanId: -1
diff --git a/test/plugin/scenarios/spring-scheduled-scenario/configuration.yml
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/configuration.yml
similarity index 82%
rename from test/plugin/scenarios/spring-scheduled-scenario/configuration.yml
rename to test/plugin/scenarios/spring-scheduled-6.x-scenario/configuration.yml
index 93a92b6b00..9fec8d6ef0 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/configuration.yml
+++ b/test/plugin/scenarios/spring-scheduled-6.x-scenario/configuration.yml
@@ -15,5 +15,5 @@
# limitations under the License.
type: tomcat
-entryService: http://localhost:8080/spring-scheduled-scenario/case/healthCheck
-healthCheck: http://localhost:8080/spring-scheduled-scenario/case/healthCheck
\ No newline at end of file
+entryService:
http://localhost:8080/spring-scheduled-6.x-scenario/case/healthCheck
+healthCheck:
http://localhost:8080/spring-scheduled-6.x-scenario/case/healthCheck
\ No newline at end of file
diff --git a/test/plugin/scenarios/spring-scheduled-scenario/pom.xml
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/pom.xml
similarity index 79%
rename from test/plugin/scenarios/spring-scheduled-scenario/pom.xml
rename to test/plugin/scenarios/spring-scheduled-6.x-scenario/pom.xml
index 10f388f6ac..273d32a00b 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/pom.xml
+++ b/test/plugin/scenarios/spring-scheduled-6.x-scenario/pom.xml
@@ -21,29 +21,28 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.skywalking.apm.testcase</groupId>
- <artifactId>spring-scheduled-scenario</artifactId>
+ <artifactId>spring-scheduled-6.x-scenario</artifactId>
<version>1.0.0</version>
<packaging>war</packaging>
<modelVersion>4.0.0</modelVersion>
- <name>skywalking-spring-scheduled-scenario</name>
+ <name>skywalking-spring-scheduled-6.x-scenario</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <compiler.version>1.8</compiler.version>
+ <compiler.version>17</compiler.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<lombok.version>1.18.20</lombok.version>
- <!-- Cannot be testing spring(3.2.0 ~ 3.2.8) because the tomcat image
unsupported jdk1.7 -->
- <test.framework.version>3.1.0.RELEASE</test.framework.version>
+ <test.framework.version>6.1.6</test.framework.version>
<test.framework>spring-scheduled</test.framework>
</properties>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -92,7 +91,7 @@
</dependencies>
<build>
- <finalName>spring-scheduled-scenario</finalName>
+ <finalName>spring-scheduled-6.x-scenario</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -103,17 +102,6 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <port>8080</port>
- <path>/spring-scheduled-scenario</path>
- <uriEncoding>UTF-8</uriEncoding>
- <server>tomcat7</server>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
similarity index 100%
rename from
test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
rename to
test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/controller/CaseController.java
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
similarity index 96%
rename from
test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
rename to
test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
index dc36b167e6..fd2e65ec45 100644
---
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
+++
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/scheduled/job/SchedulingJob.java
@@ -41,7 +41,7 @@ public class SchedulingJob {
public void work() throws IOException {
LOGGER.info("work job running!");
- Request request = new
Request.Builder().url("http://localhost:8080/spring-scheduled-scenario/case/call";).build();
+ Request request = new
Request.Builder().url("http://localhost:8080/spring-scheduled-6.x-scenario/case/call";).build();
Response response = CLIENT.newCall(request).execute();
response.body().close();
}
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/resources/log4j2.xml
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/resources/log4j2.xml
similarity index 100%
rename from
test/plugin/scenarios/spring-scheduled-scenario/src/main/resources/log4j2.xml
rename to
test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/resources/log4j2.xml
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
similarity index 100%
rename from
test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
rename to
test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/web.xml
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/webapp/WEB-INF/web.xml
similarity index 95%
rename from
test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/web.xml
rename to
test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/webapp/WEB-INF/web.xml
index 97967a024e..2bbdb36e96 100644
---
a/test/plugin/scenarios/spring-scheduled-scenario/src/main/webapp/WEB-INF/web.xml
+++
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/src/main/webapp/WEB-INF/web.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
version="3.1">
- <display-name>skywalking-spring-scheduled-scenario</display-name>
+ <display-name>skywalking-spring-scheduled-6.x-scenario</display-name>
<servlet>
<servlet-name>spring-mvc</servlet-name>
diff --git
a/test/plugin/scenarios/spring-scheduled-scenario/support-version.list
b/test/plugin/scenarios/spring-scheduled-6.x-scenario/support-version.list
similarity index 85%
rename from test/plugin/scenarios/spring-scheduled-scenario/support-version.list
rename to
test/plugin/scenarios/spring-scheduled-6.x-scenario/support-version.list
index 78ff603b37..44322d6089 100644
--- a/test/plugin/scenarios/spring-scheduled-scenario/support-version.list
+++ b/test/plugin/scenarios/spring-scheduled-6.x-scenario/support-version.list
@@ -14,12 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-3.1.4.RELEASE
-3.2.18.RELEASE
-4.0.9.RELEASE
-4.1.9.RELEASE
-4.2.9.RELEASE
-4.3.28.RELEASE
-5.0.18.RELEASE
-5.1.17.RELEASE
-5.2.8.RELEASE
+6.0.19
+6.1.6
\ No newline at end of file
