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

Muzzle servlet-3 Instrumentation 

Add muzzle block and remove class loader matcher method.
This commit is contained in:
Gary Huang 2018-09-07 15:37:42 -04:00 committed by Gary
parent eb5f33094b
commit c7eb667c0e
No known key found for this signature in database
GPG Key ID: 0CB168EE6C6844B7
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dd-java-agent/instrumentation/servlet-3/servlet-3.gradle
View File

@ -1,14 +1,10 @@
apply plugin: 'version-scan' muzzle {
pass {
versionScan {
group = "javax.servlet" group = "javax.servlet"
module = 'javax.servlet-api' module = 'javax.servlet-api'
legacyModule = "servlet-api"
versions = "[3.0,)" versions = "[3.0,)"
verifyPresent = [ assertInverse = true
"javax.servlet.AsyncEvent" : null, }
"javax.servlet.AsyncListener": null,
]
} }
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"

8
dd-java-agent/instrumentation/servlet-3/src/main/java/datadog/trace/instrumentation/servlet3/AbstractServlet3Instrumentation.java
View File

@ -1,9 +1,6 @@
package datadog.trace.instrumentation.servlet3; package datadog.trace.instrumentation.servlet3;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import net.bytebuddy.matcher.ElementMatcher;
public abstract class AbstractServlet3Instrumentation extends Instrumenter.Default { public abstract class AbstractServlet3Instrumentation extends Instrumenter.Default {
@ -11,11 +8,6 @@ public abstract class AbstractServlet3Instrumentation extends Instrumenter.Defau
super("servlet", "servlet-3"); super("servlet", "servlet-3");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("javax.servlet.AsyncEvent", "javax.servlet.AsyncListener");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return new String[] { return new String[] {