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 #484 from DataDog/gary/muzzle-okhttp-3 

Muzzle OKHttp 3 Instrumentation
This commit is contained in:
Gary Huang 2018-09-10 12:10:37 -04:00 committed by GitHub
parent a69bca9993 78bf5d3aff
commit 9c1b641069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle
View File

@ -1,15 +1,10 @@
apply plugin: 'version-scan' muzzle {
pass {
versionScan {
group = "com.squareup.okhttp3" group = "com.squareup.okhttp3"
module = "okhttp" module = "okhttp"
versions = "[3.0,)" versions = "[3.0,)"
legacyGroup = "com.squareup.okhttp" assertInverse = true
verifyPresent = [ }
"okhttp3.Cookie" : null,
"okhttp3.ConnectionPool": null,
"okhttp3.Headers" : null,
]
} }
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"

12
dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java
View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.okhttp3; package datadog.trace.instrumentation.okhttp3;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static datadog.trace.instrumentation.okhttp3.OkHttpClientSpanDecorator.STANDARD_TAGS; import static datadog.trace.instrumentation.okhttp3.OkHttpClientSpanDecorator.STANDARD_TAGS;
import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -30,17 +29,6 @@ public class OkHttp3Instrumentation extends Instrumenter.Default {
return named("okhttp3.OkHttpClient"); return named("okhttp3.OkHttpClient");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses(
"okhttp3.Request",
"okhttp3.Response",
"okhttp3.Connection",
"okhttp3.Cookie",
"okhttp3.ConnectionPool",
"okhttp3.Headers");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return new String[] { return new String[] {