Skip to content

Conversation

@JonasKunz
Copy link
Contributor

@JonasKunz JonasKunz commented Apr 3, 2023

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 -> jakarta package name change. The instrumentation has been adapted to rely on our existing Servlet-API adapters.

Checklist

  • This is an enhancement of existing features, or a new feature in existing plugins
    • I have updated CHANGELOG.asciidoc
    • I have added tests that prove my fix is effective or that my feature works
    • Added an API method or config option? Document in which version this will be introduced
    • I have made corresponding changes to the documentation
@JonasKunz JonasKunz added the ci:jdk-compatibility Enables JDK compatibility tests in build pipeline label Apr 3, 2023
@JonasKunz JonasKunz added ci:agent-integration Enables agent integration tests in build pipeline and removed agent-java labels Apr 3, 2023
@ghost
Copy link

ghost commented Apr 3, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview previewSnapshots

Expand to view the summary

Build stats

  • Start Time: 2023-04-17T14:36:16.907+0000

  • Duration: 13 min 7 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run benchmark tests : Run the benchmark tests.

  • run jdk compatibility tests : Run the JDK Compatibility tests.

  • run integration tests : Run the Agent Integration tests.

  • run end-to-end tests : Run the APM-ITs.

  • run windows tests : Build & tests on windows.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@JonasKunz JonasKunz marked this pull request as ready for review April 4, 2023 11:31
@JonasKunz JonasKunz requested a review from a team April 4, 2023 11:31
@github-actions
Copy link

github-actions bot commented Apr 4, 2023

/test

JonasKunz and others added 2 commits April 17, 2023 09:26
…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
@JonasKunz JonasKunz force-pushed the spring6-mvc-upgrade branch from dec528b to 660912f Compare April 17, 2023 14:35
@JonasKunz JonasKunz enabled auto-merge (squash) April 17, 2023 15:08
@JonasKunz JonasKunz merged commit a6cf715 into elastic:main Apr 17, 2023
@arnoe
Copy link

arnoe commented Apr 17, 2023

@JonasKunz @SylvainJuge Thanks for this work here!
Our team are watching this PR with hawk eyes. After the merge, I assume it is now safe to ask when the artifact will be available to use.

PS. We were about to go to production with our system's Spring / Java upgrade with or without Elastic APM.

@JonasKunz
Copy link
Contributor Author

JonasKunz commented Apr 18, 2023

Our team are watching this PR with hawk eyes. After the merge, I assume it is now safe to ask when the artifact will be available to use.

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.

@arnoe
Copy link

arnoe commented Apr 18, 2023

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?

@JonasKunz
Copy link
Contributor Author

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.

@JonasKunz JonasKunz deleted the spring6-mvc-upgrade branch April 18, 2023 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci:agent-integration Enables agent integration tests in build pipeline ci:jdk-compatibility Enables JDK compatibility tests in build pipeline

3 participants