-
Notifications
You must be signed in to change notification settings - Fork 867
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
Better server span name for Spring MVC, Grails, Wicket and Struts #2814
Merged
Conversation
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
trask
changed the title
Better server span name for Grails
Better server span name for Grails and Wicket
Apr 19, 2021
trask
requested review from
anuraaga,
iNikem,
jkwatson,
mateuszrzeszutek,
pavolloffay and
tylerbenson
as code owners
April 19, 2021 05:50
...ry/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java
Outdated
Show resolved
Hide resolved
laurit
approved these changes
Apr 19, 2021
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.
👍
.../test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.groovy
Outdated
Show resolved
Hide resolved
testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy
Outdated
Show resolved
Hide resolved
...ry/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java
Outdated
Show resolved
Hide resolved
...tation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/ServletSpanNaming.java
Outdated
Show resolved
Hide resolved
mateuszrzeszutek
approved these changes
Apr 21, 2021
.../javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsTracer.java
Outdated
Show resolved
Hide resolved
...avaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2Tracer.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
Apr 21, 2021
...entation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java
Outdated
Show resolved
Hide resolved
mateuszrzeszutek
approved these changes
Apr 22, 2021
trask
changed the title
Better server span name for Grails and Wicket
Better server span name for Spring MVC, Grails, Wicket and Struts
May 10, 2021
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.
The main change in this PR is adding a flag in
ServletSpanNaming
to prevent controller instrumentation from setting the SERVER span name more than once.Otherwise, when the servlet request is forwarded to an error controller, the error controller is overwriting the SERVER span name that was set by the controller that handled the request.
This PR only applies this change to Spring MVC, Grails, Wicket and Struts instrumentation initially. Will follow up with issue or PR to apply this change to the remaining.