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 netty-4.0 instrumentation

This commit is contained in:
Andrew Kent 2018-08-28 16:53:29 -07:00
parent b43e6e27ec
commit c06983ef34
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle
View File

@ -1,17 +1,20 @@
apply plugin: 'version-scan'
versionScan {
group = "io.netty"
module = "netty-codec-http"
legacyModule = "netty"
versions = "[4.0.0.Final,4.1.0.Final)"
verifyPresent = [
"io.netty.handler.codec.spdy.SpdyOrHttpChooser": null,
]
}
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"
muzzle {
pass {
group = "io.netty"
module = "netty-codec-http"
versions = "[4.0.0.Final,4.1.0.Final)"
assertInverse = true
}
pass {
group = "io.netty"
module = "netty"
versions = "[4.0.0.Final,4.1.0.Final)"
assertInverse = true
}
}
apply plugin: 'org.unbroken-dome.test-sets' apply plugin: 'org.unbroken-dome.test-sets'
testSets { testSets {

6
dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java
View File

@ -1,7 +1,6 @@
package datadog.trace.instrumentation.netty40; package datadog.trace.instrumentation.netty40;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
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;
@ -37,11 +36,6 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default {
.and(safeHasSuperType(named("io.netty.channel.ChannelFutureListener"))); .and(safeHasSuperType(named("io.netty.channel.ChannelFutureListener")));
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("io.netty.handler.codec.spdy.SpdyOrHttpChooser");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return new String[] {packageName + ".AttributeKeys"}; return new String[] {packageName + ".AttributeKeys"};

6
dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java
View File

@ -1,7 +1,6 @@
package datadog.trace.instrumentation.netty40; package datadog.trace.instrumentation.netty40;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType; import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
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;
import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith; import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
@ -48,11 +47,6 @@ public class NettyChannelPipelineInstrumentation extends Instrumenter.Default {
return not(isInterface()).and(safeHasSuperType(named("io.netty.channel.ChannelPipeline"))); return not(isInterface()).and(safeHasSuperType(named("io.netty.channel.ChannelPipeline")));
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("io.netty.handler.codec.spdy.SpdyOrHttpChooser");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return new String[] { return new String[] {