Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix nested http.route #8282

Merged
merged 14 commits into from
Apr 21, 2023
Merged

Fix nested http.route #8282

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8e891cb
Fix nested http.route
heyams Apr 12, 2023
79271b7
Merge remote-tracking branch 'upstream/main' into heya/fix-spring-web…
heyams Apr 13, 2023
6f7d750
Add test
heyams Apr 14, 2023
5380f5e
Fix missing import
heyams Apr 14, 2023
87ad46c
Fix null BEST_MATCHING_PATTERN_ATTRIBUTE
heyams Apr 14, 2023
3959d79
Fix tests
heyams Apr 17, 2023
8ae9540
Run latest webflux against nestedPath
heyams Apr 18, 2023
196298b
Move test down to webfluxServerTest and remove nestedPath option
heyams Apr 19, 2023
6b23289
Remove deprecated warning when testing newer version of webflux
heyams Apr 19, 2023
7ee535a
Add a comment
heyams Apr 19, 2023
b1edd50
Reword
heyams Apr 20, 2023
315d79e
Merge remote-tracking branch 'upstream/main' into heya/fix-spring-web…
heyams Apr 20, 2023
f440690
Merge branch 'heya/fix-spring-webflux-http-route' of https://github.c…
heyams Apr 20, 2023
c07f522
Move nestedPath to ImmediateHandlerSpringWebFluxServerTest
heyams Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...y/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerAdapterInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static void methodEnter(
Context parentContext = Context.current();

HttpRouteHolder.updateHttpRoute(
parentContext, HttpRouteSource.CONTROLLER, httpRouteGetter(), exchange);
parentContext, HttpRouteSource.NESTED_CONTROLLER, httpRouteGetter(), exchange);
heyams marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

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

can you add a brief comment here about why NESTED_CONTROLLER is needed?


if (handler == null) {
return;
Expand Down