Tomcat server handlers #1902
Merged
Tomcat server handlers #1902
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
…g to mimic it from the server handler.
vovencij
requested review from
anuraaga,
iNikem,
jkwatson,
mateuszrzeszutek,
trask and
tylerbenson
as code owners
iNikem
reviewed
Dec 14, 2020
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/ServerHandlerAdvice.java
Outdated
Show resolved
Hide resolved
trask
reviewed
Dec 15, 2020
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy
Show resolved
Hide resolved
instrumentation/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle
Outdated
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/ServerHandlerAdvice.java
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/ServerHandlerAdvice.java
Outdated
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/ServerHandlerAdvice.java
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java
Outdated
Show resolved
Hide resolved
anuraaga
reviewed
Dec 15, 2020
...entation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/AppServerBridge.java
Outdated
Show resolved
Hide resolved
I think so. This is the trace I get from the demo case in that ticket in my branch: And there is also an unhandled servlet exception reported in the trace: |
iNikem
reviewed
Dec 15, 2020
...entation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/AppServerBridge.java
Outdated
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/ServerHandlerAdvice.java
Outdated
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java
Show resolved
Hide resolved
laurit
reviewed
Dec 15, 2020
...javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatTracer.java
Outdated
Show resolved
Hide resolved
iNikem
reviewed
Dec 15, 2020
...entation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/AppServerBridge.java
Show resolved
Hide resolved
…pServerBridge to the ServletHttpServerTracer.
iNikem
reviewed
Dec 16, 2020
...vlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Advice.java
Outdated
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/ServerHandlerAdvice.java
Outdated
Show resolved
Hide resolved
...nt/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/ServerHandlerAdvice.java
Show resolved
Hide resolved
...javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatTracer.java
Outdated
Show resolved
Hide resolved
instrumentation/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle
Outdated
Show resolved
Hide resolved
iNikem
approved these changes
Dec 16, 2020
bhautikpip
pushed a commit
to bhautikpip/opentelemetry-java-instrumentation
that referenced
this pull request
Dec 18, 2020
* Tomcat server handler with passing integration and smoke tests. * Update server span name from the servlet integration instead of trying to mimic it from the server handler. * Cleanup and more javadocs. * Use Java8BytecodeBridge in advice code. * Use Java8BytecodeBridge in advice code. * Use earliest version for compilation and muzzling. * Use consistent instrumentation name. * Record throwables only if the context is managed by something else. * Getting scope handling right. Moved server span renaming logic via AppServerBridge to the ServletHttpServerTracer. * codenarc * more PR comments addressed * Pass Method to startServerSpan
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.
This is a Tomcat version of a server handler, as described and discussed in #1886
Some notable findings:
Server instrumentation needs uncaught exceptions from outermost servlets/filters. These are passed viaOutermost servlets/filters set their unhandled exceptions with the current span.AppServerBridge.THROWABLE_CONTEXT_KEYcontext attribute.AppServerBridgecontext attribute and not the intuitivecallDepthcounter.