-
Notifications
You must be signed in to change notification settings - Fork 850
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
Update webflux to Instrumenter API (and improvements/simplifications) #3798
Merged
trask
merged 17 commits into
open-telemetry:main
from
trask:update-webflux-to-instrumenter-api
Aug 13, 2021
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
c5ebca5
Update Webflux to Instrumenter API
trask 6695abc
Change webflux handler to match other handlers
trask bc9f077
Further simplification
trask e56b099
Fix Mono failure tests
trask d3c4a05
Comment
trask 9df4a14
FLAKY
trask e95e964
Comment
trask c152c6d
Revert "FLAKY"
trask 26f36fb
Merge remote-tracking branch 'upstream/main' into update-webflux-to-i…
trask d5a9bd8
Use extractors!
trask 72a27e3
Renames
trask df2cfa8
Fix comment
trask 8f6cd24
Update instrumentation/spring/spring-webflux-5.0/javaagent/src/main/j…
trask 111a885
Merge remote-tracking branch 'upstream/main' into update-webflux-to-i…
trask 04e4bf3
Keep extra cancellation behavior for now
trask 821b1b5
Revert "Keep extra cancellation behavior for now"
trask 20db675
Merge remote-tracking branch 'upstream/main' into update-webflux-to-i…
trask File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Further simplification
- Loading branch information
commit bc9f0771a5d0ff63bbf8bfb9f57454d180588b0b
There are no files selected for viewing
This file contains 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
51 changes: 0 additions & 51 deletions
51
...try/javaagent/instrumentation/spring/webflux/server/DispatcherHandlerInstrumentation.java
This file was deleted.
Oops, something went wrong.
This file contains 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
This file contains 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
This file contains 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
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Although this part wasn't changed in this pr getting a span name from an object is also used in other instrumentations so it would be nice if someone figured out how to do this properly. The problem here is that handler could be anything. For example
SpringWebFluxTestApplication
when you addand change the start of
greetRouterFunction
toThen span name is
SpringWebFluxTestApplication$GreetingHandlerFunction$$EnhancerBySpringCGLIB$$d662c0c3.handle
When you change scope annotation to
@Scope(value = "prototype", proxyMode = ScopedProxyMode.INTERFACES)
then span name is
$Proxy119.handle
If we'd assume that handler is a spring bean we could try to unwrap it with something like spring-projects/spring-framework@efe3a35
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 I created issue for this #3813