Skip to content

JAX-WS @WebMethod is optional#2667

Merged
felixbarny merged 5 commits intoelastic:mainfrom
felixbarny:improved-jaxw-service-matching
Jun 13, 2022
Merged

JAX-WS @WebMethod is optional#2667
felixbarny merged 5 commits intoelastic:mainfrom
felixbarny:improved-jaxw-service-matching

Conversation

@felixbarny
Copy link
Member

@felixbarny felixbarny commented Jun 13, 2022

What does this PR do?

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
  • This is a bugfix
  • This is a new plugin
    • I have updated CHANGELOG.asciidoc
    • My code follows the style guidelines of this project
    • I have made corresponding changes to the documentation
    • I have added tests that prove my fix is effective or that my feature works
    • New and existing unit tests pass locally with my changes
    • I have updated supported-technologies.asciidoc
    • Added an API method or config option? Document in which version this will be introduced
    • Added an instrumentation plugin? Describe how you made sure that old, non-supported versions are not instrumented by accident.
  • This is something else

@ghost
Copy link

ghost commented Jun 13, 2022

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-06-13T13:24:28.664+0000

  • Duration: 53 min 50 sec

Test stats 🧪

Test Results
Failed 0
Passed 2957
Skipped 22
Total 2979

💚 Flaky test report

Tests succeeded.

🤖 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!)

@felixbarny felixbarny changed the title JAX-W @WebMethod is optional JAX-WS @WebMethod is optional Jun 13, 2022
@felixbarny felixbarny requested a review from SylvainJuge June 13, 2022 09:33
Comment on lines +81 to +83
&& !new TypeList.Explicit(new ArrayList<>(hierarchy))
.filter(hierarchyMatcher)
.isEmpty()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[minor] this one probably deserves to be explained a bit, maybe through a comment. If I understand it correctly it's "the type matches the hierarchyMatcher", maybe nesting an IF in this case could help.

package co.elastic.apm.soap;

public interface BaseHelloWorldService {
String sayHello();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[minor] maybe add a small comment to remind that the @WebMethod annotation is optional on the method level.

===== Bug fixes
* Fix missing attributes in bridged OTel transactions - {pull}2657[#2657]
* Fix `transaction.result` with bridged OTel transactions - {pull}2660[#2660]
* Fix for JAX-WS (SOAP) transaction names. Now the agent also properly names transaction for web service methods that are not annotated with `@WebMethod`. - {pull}2667[#2667]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changelog have to be re-updated as it won't be part of today's release.

@SylvainJuge SylvainJuge marked this pull request as ready for review June 13, 2022 11:57
@github-actions
Copy link

/test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants