From a8f52d8c521e3a6f6c23432ebb93c21de6f6e0de Mon Sep 17 00:00:00 2001 From: Gary Huang Date: Fri, 7 Sep 2018 17:15:35 -0400 Subject: [PATCH] Muzzle Jetty Instrumentation Add muzzle block and remove class loader matcher method. --- .../instrumentation/jetty-8/jetty-8.gradle | 16 +++++++--------- .../jetty8/HandlerInstrumentation.java | 6 ------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle b/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle index c22c8ec4cf..131467369f 100644 --- a/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle +++ b/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle @@ -1,12 +1,10 @@ -apply plugin: 'version-scan' - -versionScan { - group = "org.eclipse.jetty" - module = 'jetty-server' - versions = "[8.0.0.v20110901,)" - verifyMissing = [ - "org.eclipse.jetty.server.AsyncContext", - ] +muzzle { + pass { + group = "org.eclipse.jetty" + module = 'jetty-server' + versions = "[8.0.0.v20110901,)" + assertInverse = true + } } apply from: "${rootDir}/gradle/java.gradle" diff --git a/dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/HandlerInstrumentation.java b/dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/HandlerInstrumentation.java index 3b97d67505..5396bd9a7e 100644 --- a/dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/HandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/HandlerInstrumentation.java @@ -1,7 +1,6 @@ package datadog.trace.instrumentation.jetty8; 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.isPublic; 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"))); } - @Override - public ElementMatcher classLoaderMatcher() { - return not(classLoaderHasClasses("org.eclipse.jetty.server.AsyncContext")); - } - @Override public String[] helperClassNames() { return new String[] {