open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175 from DataDog/tyler/fix-jersey 

Fix jersey servlet instrumentation which overrides method
This commit is contained in:
Tyler Benson 2017-12-19 17:22:12 -08:00 committed by GitHub
parent 922b3012e6 d6056a3c27
commit 6509ed32b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent/integrations/servlet-2/src/main/java/dd/inst/servlet2/HttpServlet2Instrumentation.java
View File

@ -1,6 +1,8 @@
package dd.inst.servlet2; package dd.inst.servlet2;
import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses;
import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isProtected; import static net.bytebuddy.matcher.ElementMatchers.isProtected;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.not;
@ -30,7 +32,7 @@ public final class HttpServlet2Instrumentation implements Instrumenter {
public AgentBuilder instrument(final AgentBuilder agentBuilder) { public AgentBuilder instrument(final AgentBuilder agentBuilder) {
return agentBuilder return agentBuilder
.type( .type(
named("javax.servlet.http.HttpServlet"), not(isInterface()).and(hasSuperType(named("javax.servlet.http.HttpServlet"))),
not(classLoaderHasClasses("javax.servlet.AsyncEvent", "javax.servlet.AsyncListener")) not(classLoaderHasClasses("javax.servlet.AsyncEvent", "javax.servlet.AsyncListener"))
.and( .and(
classLoaderHasClasses( classLoaderHasClasses(

5
dd-java-agent/integrations/servlet-3/src/main/java/dd/inst/servlet3/HttpServlet3Instrumentation.java
View File

@ -1,8 +1,11 @@
package dd.inst.servlet3; package dd.inst.servlet3;
import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses; import static dd.trace.ClassLoaderMatcher.classLoaderHasClasses;
import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isProtected; import static net.bytebuddy.matcher.ElementMatchers.isProtected;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.not;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
@ -33,7 +36,7 @@ public final class HttpServlet3Instrumentation implements Instrumenter {
public AgentBuilder instrument(final AgentBuilder agentBuilder) { public AgentBuilder instrument(final AgentBuilder agentBuilder) {
return agentBuilder return agentBuilder
.type( .type(
named("javax.servlet.http.HttpServlet"), not(isInterface()).and(hasSuperType(named("javax.servlet.http.HttpServlet"))),
classLoaderHasClasses("javax.servlet.AsyncEvent", "javax.servlet.AsyncListener")) classLoaderHasClasses("javax.servlet.AsyncEvent", "javax.servlet.AsyncListener"))
.transform( .transform(
DDAdvice.create() DDAdvice.create()