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

View File

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

View File

@ -1,6 +1,5 @@
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.named;
@ -27,11 +26,6 @@ public class GrpcClientBuilderInstrumentation extends Instrumenter.Default {
return named("io.grpc.internal.AbstractManagedChannelImplBuilder");
}
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("io.grpc.InternalServerInterceptors");
}
@Override
public String[] helperClassNames() {
return new String[] {

View File

@ -1,6 +1,5 @@
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.named;
@ -27,11 +26,6 @@ public class GrpcServerBuilderInstrumentation extends Instrumenter.Default {
return named("io.grpc.internal.AbstractServerImplBuilder");
}
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("io.grpc.InternalServerInterceptors");
}
@Override
public String[] helperClassNames() {
return new String[] {