You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by "kezhenxu94 (via GitHub)" <gi...@apache.org> on 2023/01/29 11:59:13 UTC
[GitHub] [skywalking-java] kezhenxu94 opened a new pull request, #444: Add Spring 6 to test case
kezhenxu94 opened a new pull request, #444:
URL: https://github.com/apache/skywalking-java/pull/444
<!--
β οΈ Please make sure to read this template first, pull requests that don't accord with this template
maybe closed without notice.
Texts surrounded by `<` and `>` are meant to be replaced by you, e.g. <framework name>, <issue number>.
Put an `x` in the `[ ]` to mark the item as CHECKED. `[x]`
-->
<!-- ==== π Remove this line WHEN AND ONLY WHEN you're fixing a bug, follow the checklist π ====
### Fix <bug description or the bug issue number or bug issue link>
- [ ] Add a unit test to verify that the fix works.
- [ ] Explain briefly why the bug exists and how to fix it.
==== π Remove this line WHEN AND ONLY WHEN you're fixing a bug, follow the checklist π ==== -->
<!-- ==== π Remove this line WHEN AND ONLY WHEN you're adding a new plugin, follow the checklist π ====
### Add an agent plugin to support <framework name>
- [ ] Add a test case for the new plugin, refer to [the doc](https://github.com/apache/skywalking-java/blob/main/docs/en/setup/service-agent/java-agent/Plugin-test.md)
- [ ] Add a component id in [the component-libraries.yml](https://github.com/apache/skywalking/blob/master/oap-server/server-starter/src/main/resources/component-libraries.yml)
- [ ] Add a logo in [the UI repo](https://github.com/apache/skywalking-rocketbot-ui/tree/master/src/views/components/topology/assets)
==== π Remove this line WHEN AND ONLY WHEN you're adding a new plugin, follow the checklist π ==== -->
<!-- ==== π Remove this line WHEN AND ONLY WHEN you're improving the performance, follow the checklist π ====
### Improve the performance of <class or module or ...>
- [ ] Add a benchmark for the improvement, refer to [the existing ones](https://github.com/apache/skywalking-java/blob/main/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java)
- [ ] The benchmark result.
```text
<Paste the benchmark results here>
```
- [ ] Links/URLs to the theory proof or discussion articles/blogs. <links/URLs here>
==== π Remove this line WHEN AND ONLY WHEN you're improving the performance, follow the checklist π ==== -->
<!-- ==== π Remove this line WHEN AND ONLY WHEN you're adding a new feature, follow the checklist π ====
### <Feature description>
- [ ] If this is non-trivial feature, paste the links/URLs to the design doc.
- [ ] Update the documentation to include this new feature.
- [ ] Tests(including UT, IT, E2E) are added to verify the new feature.
- [ ] If it's UI related, attach the screenshots below.
==== π Remove this line WHEN AND ONLY WHEN you're adding a new feature, follow the checklist π ==== -->
- [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #<issue number>.
- [ ] Update the [`CHANGES` log](https://github.com/apache/skywalking-java/blob/main/CHANGES.md).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] kezhenxu94 commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "kezhenxu94 (via GitHub)" <gi...@apache.org>.
kezhenxu94 commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091528742
##########
pom.xml:
##########
@@ -345,24 +361,28 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>${compiler.version}</source>
+ <source>
Review Comment:
Sure, changed to `<release>` configuration, in plugin tests it's still `<source>` and `<target>` as the plugin tests are still built and run in Java 8
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] lujiajing1126 commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "lujiajing1126 (via GitHub)" <gi...@apache.org>.
lujiajing1126 commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091775973
##########
pom.xml:
##########
@@ -345,24 +361,28 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>${compiler.version}</source>
+ <source>
Review Comment:
> I reverted the `<release>` back to `<source>` and `<target>` as that won't compile in our case, and because the plugin tests are still run in Java 8 that's OK enough to ensure we don't use APIs from > Java 8
I see. The `sun.*` is a disaster...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] wu-sheng commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091739725
##########
docs/en/setup/service-agent/java-agent/Supported-list.md:
##########
@@ -26,7 +26,7 @@ metrics based on the tracing data.
* [Netflix Spring Cloud Feign](https://github.com/spring-cloud/spring-cloud-openfeign) 1.1.x -> 2.x
* [Okhttp](https://github.com/square/okhttp) 2.x -> 3.x -> 4.x
* [Apache httpcomponent HttpClient](http://hc.apache.org/) 2.0 -> 3.1, 4.2, 4.3, 5.0, 5.1
- * [Spring RestTemplate](https://github.com/spring-projects/spring-framework) 4.x
+ * [Spring RestTemplate](https://github.com/spring-projects/spring-framework) 4.x -> 6.x
Review Comment:
RestTemplate 6 plugin is in opt1 optional too?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] wu-sheng commented on pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#issuecomment-1410086094
Do you update supported list doc? I can't find it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] wu-sheng commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091738813
##########
docs/en/setup/service-agent/java-agent/Supported-list.md:
##########
@@ -8,7 +8,7 @@ metrics based on the tracing data.
* [Tomcat](https://github.com/apache/tomcat) 9
* [Tomcat](https://github.com/apache/tomcat) 10
* [Spring Boot](https://github.com/spring-projects/spring-boot) Web 4.x
- * Spring MVC 3.x, 4.x 5.x with servlet 3.x
+ * Spring MVC 3.x, 4.x 5.x with servlet 3.x, 6.x
Review Comment:
Opt 1?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] lujiajing1126 commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "lujiajing1126 (via GitHub)" <gi...@apache.org>.
lujiajing1126 commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091504830
##########
pom.xml:
##########
@@ -345,24 +361,28 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>${compiler.version}</source>
+ <source>
Review Comment:
For JDK17, as I understand we should switch to `--release` argument of `javac` instead of keep using `source` and `target`. This can give us better guarantee of backward-compatibility with such cross-compilation.
- https://maven.apache.org/plugins/maven-compiler-plugin/examples/set-compiler-release.html
- https://stackoverflow.com/questions/43102787/what-is-the-release-flag-in-the-java-9-compiler/43103038#43103038
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] kezhenxu94 commented on pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "kezhenxu94 (via GitHub)" <gi...@apache.org>.
kezhenxu94 commented on PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#issuecomment-1410104165
> Do you update supported list doc? I can't find it.
Updated
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] wu-sheng commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091738229
##########
docs/en/setup/service-agent/java-agent/Supported-list.md:
##########
@@ -8,7 +8,7 @@ metrics based on the tracing data.
* [Tomcat](https://github.com/apache/tomcat) 9
* [Tomcat](https://github.com/apache/tomcat) 10
* [Spring Boot](https://github.com/spring-projects/spring-boot) Web 4.x
- * Spring MVC 3.x, 4.x 5.x with servlet 3.x
+ * Spring MVC 3.x, 4.x 5.x with servlet 3.x, 6.x
Review Comment:
It is better to be in a new line with optional flag.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] kezhenxu94 commented on pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "kezhenxu94 (via GitHub)" <gi...@apache.org>.
kezhenxu94 commented on PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#issuecomment-1409801597
For all @apache/skywalking-committers , I've removed Powermock completely from skywalking-java repository and there is no reason we would bring it back in the future, I'll also try to remove it in the skywalking main repo. This is a future-prove work because Powermock would block us from upgrading the JDK baseline to Java8+, or upgrading the Junit framework to Junit 5. So be careful when you review contributors' pull requests, if they bring Powermock back, don't allow to merge.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] kezhenxu94 commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "kezhenxu94 (via GitHub)" <gi...@apache.org>.
kezhenxu94 commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091560039
##########
pom.xml:
##########
@@ -345,24 +361,28 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>${compiler.version}</source>
+ <source>
Review Comment:
I reverted the `<release>` back to `<source>` and `<target>` as that won't compile in our case, and because the plugin tests are still run in Java 8 that's OK enough to ensure we don't use APIs from > Java 8
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] wu-sheng commented on pull request #444: Add Spring 6 to test case
Posted by "wu-sheng (via GitHub)" <gi...@apache.org>.
wu-sheng commented on PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#issuecomment-1407660690
**Notice, SkyWalking Java Agent requires JDK17 for compiling due to support Spring 6. Meanwhile, JRE for the runtime is kept as same as before. Only Spring 6 plugin is compiled in Java 17.**
@kezhenxu94 please check whether this statement is accurate, and add the final statement as project level chang log for this version.
And we should send a mail list and a short blog to be advance.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] wankai123 commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "wankai123 (via GitHub)" <gi...@apache.org>.
wankai123 commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091512398
##########
apm-sniffer/optional-plugins/optional-spring-plugins/mvc-annotation-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v6/define/AbstractSpring5Instrumentation.java:
##########
@@ -0,0 +1,29 @@
+/*
+ * 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.apm.plugin.spring.mvc.v6.define;
+
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
+
+public abstract class AbstractSpring5Instrumentation extends ClassInstanceMethodsEnhancePluginDefine {
Review Comment:
should be `AbstractSpring6Instrumentation` ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] kezhenxu94 commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "kezhenxu94 (via GitHub)" <gi...@apache.org>.
kezhenxu94 commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091528172
##########
apm-sniffer/optional-plugins/optional-spring-plugins/mvc-annotation-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v6/define/AbstractSpring5Instrumentation.java:
##########
@@ -0,0 +1,29 @@
+/*
+ * 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.apm.plugin.spring.mvc.v6.define;
+
+import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
+
+public abstract class AbstractSpring5Instrumentation extends ClassInstanceMethodsEnhancePluginDefine {
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] kezhenxu94 commented on pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "kezhenxu94 (via GitHub)" <gi...@apache.org>.
kezhenxu94 commented on PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#issuecomment-1409872407
> Also I found many unexpected line breaks. Are these changes deliberate?
The culprit is the IDE that does the auto format when I modify the file, have reverted those.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] kezhenxu94 merged pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "kezhenxu94 (via GitHub)" <gi...@apache.org>.
kezhenxu94 merged PR #444:
URL: https://github.com/apache/skywalking-java/pull/444
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] kezhenxu94 commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "kezhenxu94 (via GitHub)" <gi...@apache.org>.
kezhenxu94 commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091742157
##########
docs/en/setup/service-agent/java-agent/Supported-list.md:
##########
@@ -26,7 +26,7 @@ metrics based on the tracing data.
* [Netflix Spring Cloud Feign](https://github.com/spring-cloud/spring-cloud-openfeign) 1.1.x -> 2.x
* [Okhttp](https://github.com/square/okhttp) 2.x -> 3.x -> 4.x
* [Apache httpcomponent HttpClient](http://hc.apache.org/) 2.0 -> 3.1, 4.2, 4.3, 5.0, 5.1
- * [Spring RestTemplate](https://github.com/spring-projects/spring-framework) 4.x
+ * [Spring RestTemplate](https://github.com/spring-projects/spring-framework) 4.x -> 6.x
Review Comment:
> RestTemplate 6 plugin is in opt1 optional too?
Should be opt2 actually
> ΒΉDue to license incompatibilities/restrictions these plugins are hosted and released in 3rd part repository,
> go to [SkyAPM java plugin extension repository](https://github.com/SkyAPM/java-plugin-extensions) to get these.
> Β²These plugins affect the performance or must be used under some conditions, from experiences. So only released in `/optional-plugins` or `/bootstrap-plugins`, copy to `/plugins` in order to make them work.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-java] kezhenxu94 commented on a diff in pull request #444: Add plugin for Spring 6, set development baseline to JDK 17, remove Powermock entirely
Posted by "kezhenxu94 (via GitHub)" <gi...@apache.org>.
kezhenxu94 commented on code in PR #444:
URL: https://github.com/apache/skywalking-java/pull/444#discussion_r1091742157
##########
docs/en/setup/service-agent/java-agent/Supported-list.md:
##########
@@ -26,7 +26,7 @@ metrics based on the tracing data.
* [Netflix Spring Cloud Feign](https://github.com/spring-cloud/spring-cloud-openfeign) 1.1.x -> 2.x
* [Okhttp](https://github.com/square/okhttp) 2.x -> 3.x -> 4.x
* [Apache httpcomponent HttpClient](http://hc.apache.org/) 2.0 -> 3.1, 4.2, 4.3, 5.0, 5.1
- * [Spring RestTemplate](https://github.com/spring-projects/spring-framework) 4.x
+ * [Spring RestTemplate](https://github.com/spring-projects/spring-framework) 4.x -> 6.x
Review Comment:
> RestTemplate 6 plugin is in opt1 optional too?
Should be opt2 actually
> ΒΉDue to license incompatibilities/restrictions these plugins are hosted and released in 3rd part repository,
> go to [SkyAPM java plugin extension repository](https://github.com/SkyAPM/java-plugin-extensions) to get these.
> Β²These plugins affect the performance or must be used under some conditions, from experiences. So only released in `/optional-plugins` or `/bootstrap-plugins`, copy to `/plugins` in order to make them work.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org