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 #486 from DataDog/gary/muzzle-jetty 

Muzzle Jetty Instrumentation
This commit is contained in:
Gary Huang 2018-09-19 16:07:19 -04:00 committed by GitHub
parent 4db131b415 a8f52d8c52
commit 622db5942b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dd-java-agent/instrumentation/jetty-8/jetty-8.gradle
View File

@ -1,12 +1,10 @@
apply plugin: 'version-scan' muzzle {
pass {
versionScan { group = "org.eclipse.jetty"
group = "org.eclipse.jetty" module = 'jetty-server'
module = 'jetty-server' versions = "[8.0.0.v20110901,)"
versions = "[8.0.0.v20110901,)" assertInverse = true
verifyMissing = [ }
"org.eclipse.jetty.server.AsyncContext",
]
} }
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"

6
dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/HandlerInstrumentation.java
View File

@ -1,7 +1,6 @@
package datadog.trace.instrumentation.jetty8; package datadog.trace.instrumentation.jetty8;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -35,11 +34,6 @@ public final class HandlerInstrumentation extends Instrumenter.Default {
.and(not(named("org.eclipse.jetty.server.handler.HandlerWrapper"))); .and(not(named("org.eclipse.jetty.server.handler.HandlerWrapper")));
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return not(classLoaderHasClasses("org.eclipse.jetty.server.AsyncContext"));
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return new String[] { return new String[] {