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 #481 from DataDog/gary/muzzle-spring-web 

Muzzle Spring Web Instrumentation
This commit is contained in:
Gary Huang 2018-09-10 20:00:46 -04:00 committed by GitHub
parent d7b87c07d8 5bac242a89
commit 202deaa0a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dd-java-agent/instrumentation/spring-web/spring-web.gradle
View File

@ -1,15 +1,11 @@
//apply plugin: 'version-scan' muzzle {
// pass {
//versionScan { group = 'org.springframework'
// group = 'org.springframework' module = 'javax.servlet.api'
// module = 'spring-webmvc' versions = "[3.0.0.RELEASE,)"
// legacyModule = "servlet-api" extraDependency "javax.servlet:javax.servlet.api:3.0.0"
// versions = "[3.0,)" }
// verifyPresent = [ }
// "javax.servlet.AsyncEvent" : null,
// "javax.servlet.AsyncListener": null,
// ]
//}
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"

7
dd-java-agent/instrumentation/spring-web/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java
View File

@ -1,7 +1,6 @@
package datadog.trace.instrumentation.springweb; package datadog.trace.instrumentation.springweb;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClassWithField;
import static io.opentracing.log.Fields.ERROR_OBJECT; import static io.opentracing.log.Fields.ERROR_OBJECT;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -46,12 +45,6 @@ public final class HandlerAdapterInstrumentation extends Instrumenter.Default {
.and(safeHasSuperType(named("org.springframework.web.servlet.HandlerAdapter"))); .and(safeHasSuperType(named("org.springframework.web.servlet.HandlerAdapter")));
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClassWithField(
"org.springframework.web.servlet.HandlerMapping", "BEST_MATCHING_PATTERN_ATTRIBUTE");
}
@Override @Override
public Map<ElementMatcher, String> transformers() { public Map<ElementMatcher, String> transformers() {
return Collections.<ElementMatcher, String>singletonMap( return Collections.<ElementMatcher, String>singletonMap(