Instrument spring-web 6 & spring-webmvc 6 #7366
Merged
Conversation
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
mateuszrzeszutek
force-pushed
the
instrument-spring-web-6
branch
from
aeeb340 to
61a832f
Compare
laurit
approved these changes
Dec 9, 2022
trask
approved these changes
Dec 11, 2022
Member
trask
left a comment
trask
left a comment
There was a problem hiding this comment.
do you think we should port ServletFilterTest to 6.0 at some point?
.../java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/HandlerSpanNameExtractor.java
Outdated
Show resolved
Hide resolved
| if (springCtx.containsBean("otelAutoDispatcherFilter")) { | ||
| OpenTelemetryHandlerMappingFilter filter = | ||
| (OpenTelemetryHandlerMappingFilter) springCtx.getBean("otelAutoDispatcherFilter"); | ||
| if (handlerMappings != null) { |
Member
There was a problem hiding this comment.
what was reason for not keeping the filter != null condition?
Member
Author
There was a problem hiding this comment.
getBean() will never return null - it'll either return the filter or throw.
Member
Author
Yeah, we should. I didn't want to do it in this PR, as it's already quite huge. I'll add the test in one of the next PRs. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Part of #7203
This PR is mostly copy-paste and working around the differences, conceptually the new instrumentation is the same as the old one