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 gRPC Instrumentation 

Add muzzle block and remove class loader matcher methods.
This commit is contained in:
Gary Huang 2018-09-07 20:02:40 -04:00
parent 0f3e119ae5
commit 48ad43e423
No known key found for this signature in database
GPG Key ID: 225B4CE0235DF2D1
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle
View File

@ -1,12 +1,9 @@
apply plugin: 'version-scan' muzzle {
pass {
versionScan { group = "io.grpc"
group = "io.grpc" module = "grpc-core"
module = "grpc-core" versions = "[1.5.0,)"
versions = "[1.5.0,)" }
verifyPresent = [
"io.grpc.InternalServerInterceptors": null,
]
} }
buildscript { buildscript {

6
dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientBuilderInstrumentation.java
View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.grpc.client; package datadog.trace.instrumentation.grpc.client;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -27,11 +26,6 @@ public class GrpcClientBuilderInstrumentation extends Instrumenter.Default {
return named("io.grpc.internal.AbstractManagedChannelImplBuilder"); return named("io.grpc.internal.AbstractManagedChannelImplBuilder");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("io.grpc.InternalServerInterceptors");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return new String[] { return new String[] {

6
dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java
View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.grpc.server; package datadog.trace.instrumentation.grpc.server;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -27,11 +26,6 @@ public class GrpcServerBuilderInstrumentation extends Instrumenter.Default {
return named("io.grpc.internal.AbstractServerImplBuilder"); return named("io.grpc.internal.AbstractServerImplBuilder");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("io.grpc.InternalServerInterceptors");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return new String[] { return new String[] {