Fix instrumentation for WebFlux with Spring 6.x - #2936
Merged
Conversation
Contributor
Author
|
And a few more minutes thinking about it - it is insufficient to change the source, the bytecode would still contain the wrong method signature 🤦♂️ |
kuisathaverat
approved these changes
Dec 27, 2022
Contributor
Author
|
I used this fix to set up the stage to switch to the following state:
The latter was achieved through maven profile, as follows:
|
9 tasks
1 task
eyalkoren
marked this pull request as ready for review
January 12, 2023 08:13
|
/test |
jackshirazi
reviewed
Jan 13, 2023
jackshirazi
approved these changes
Jan 17, 2023
Contributor
Author
|
For now I treated this as a bug fix, postponing the documentation of it as supported to #2942 |
eyalkoren
enabled auto-merge (squash)
January 23, 2023 15:11
v1v
added a commit
that referenced
this pull request
Jan 25, 2023
…actions * upstream/main: (76 commits) Bump version.byte-buddy from 1.12.20 to 1.12.21 (#2953) Fix instrumentation for WebFlux with Spring 6.x (#2936) Fix SQS instrumentation within messaging transactions (#2979) Add test for unsampled Transaction (#2950) clarify about dropped requests for sampling in documentation (#2957) Doc add first stack trace detail (#2978) SpanBuilder.addLink is supported, so delete wrong comment (#2975) [doc] document log sending (#2929) Fix agent log sending (#2974) Bump version.aws.sdk from 2.19.8 to 2.19.18 in /apm-agent-plugins (#2973) test: synchronizing gherkin specs (#2965) Bump aws-java-sdk from 1.12.353 to 1.12.376 in /apm-agent-plugins (#2944) Fixed AgentOverheadMetricsTest flakyness (#2918) Fix AWS instrumentation destination.service.resource handling (#2947) [doc] restructure logs doc (#2916) Junit5 test with dependencies runner (#2962) Set service target for non-sampled ES client spans (#2959) Send logs via intake API (#2694) [doc] setup with docker image (#2956) Increase CI build timeout (#2955) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fixes #2935
I locally managed to successfully run the entire WebFlux instrumentation plugin tests with spring-web 6.0.3 and spring-boot 3.0.1 with only this small change in the instrumentation, so I think it may be enough.
Adding the tests require some more efforts and we should probably add a dedicated spring-boot 3.x test and possibly upgrade the spring-boot we test with in other modules, so if this fix is verified, tests will be included in a separate PR.
Checklist