- Notifications
You must be signed in to change notification settings - Fork 327
Added spring 6 webmvc support #3094
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
| /test |
apm-agent-core/src/test/java/co/elastic/apm/agent/testutils/assertions/AbstractSpanAssert.java Outdated Show resolved Hide resolved
.../src/main/java/co/elastic/apm/agent/springwebmvc/Spring5ExceptionHandlerInstrumentation.java Outdated Show resolved Hide resolved
...lugin/src/main/java/co/elastic/apm/agent/springwebmvc/Spring6ServiceNameInstrumentation.java Outdated Show resolved Hide resolved
...vc-plugin/src/test/java/co/elastic/apm/agent/springwebmvc/template/Spring6ThymeleafTest.java Outdated Show resolved Hide resolved
apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml Outdated Show resolved Hide resolved
...ebmvc-spring5/src/main/java/co/elastic/apm/agent/springwebmvc/ViewRenderInstrumentation.java Show resolved Hide resolved
…sertions/AbstractSpanAssert.java Co-authored-by: SylvainJuge <syl20j@gmail.com>
# Conflicts: # apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/src/main/java/co/elastic/apm/agent/springwebmvc/AbstractServletWrappingControllerTransactionNameInstrumentation.java # apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/src/main/java/co/elastic/apm/agent/springwebmvc/AbstractSpringTransactionNameInstrumentation.java
dec528b to 660912f Compare | @JonasKunz @SylvainJuge Thanks for this work here! PS. We were about to go to production with our system's Spring / Java upgrade with or without Elastic APM. |
@arnoe we don't have a fixed release schedule, but we still do have a few more changes in our pipeline which we want to include in the next release. Therefore, it might take a few weeks until we publish the next release. If it is this urgent for you, you can already use the snapshot from the PR build and upgrade to the next release as soon as it is available. This would also help us identify potential issues not uncovered by our own test prior to a release. Normally you can also use the snapshot from the main branch in such cases. However, the daily pipeline run failed the last time, therefore that snapshot is not up to date yet. |
| Okay, thanks @JonasKunz for clarifying the expectations on the release. We're taking a look at the snapshot for now. Would feedback here be helpful? |
Feedback is always welcome! If you discover any issues with the spring 6 support the best place to report it would be via comments in the corresponding issue: #2942. |
What does this PR do?
Adds support and tests for spring 6 webmvc (Part of #2942).
We continue to test with both spring 5 and 6. The instrumentation itself did not require changes except for the
javax->jakartapackage name change. The instrumentation has been adapted to rely on our existing Servlet-API adapters.Checklist
Added an API method or config option? Document in which version this will be introduced