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 and Expand Cassandra Instrumentation 

Add muzzle block and remove class loader matcher method. Muzzling the instrumentation works for versions 2.3+
This commit is contained in:
Gary Huang 2018-09-10 18:30:42 -04:00
parent 9c1b641069
commit a366ed9e80
No known key found for this signature in database
GPG Key ID: 225B4CE0235DF2D1
5 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle → dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle
View File

@ -1,16 +1,9 @@
// TODO: VersionScan plugin does not report which version failed, which is making it hard to get meaningful results out of this block. muzzle {
// Once versionScan can report on which version failed, this can be enabled. pass {
// The desire is to apply the instrumentation to cassandra-datastax 2.3 and beyond. group = "com.datastax.cassandra"
module = "cassandra-driver-core"
apply plugin: 'version-scan' versions = "[2.3.0,)"
}
versionScan {
group = "com.datastax.cassandra"
module = "cassandra-driver-core"
versions = "[3.2.0,)"
verifyPresent = [
"com.datastax.driver.core.Duration": null,
]
} }
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"

6
dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java → dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.datastax.cassandra; package datadog.trace.instrumentation.datastax.cassandra;
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.isPrivate; import static net.bytebuddy.matcher.ElementMatchers.isPrivate;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -30,11 +29,6 @@ public class CassandraClientInstrumentation extends Instrumenter.Default {
return named("com.datastax.driver.core.Cluster$Manager"); return named("com.datastax.driver.core.Cluster$Manager");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("com.datastax.driver.core.Duration");
}
@Override @Override
public String[] helperClassNames() { public String[] helperClassNames() {
return new String[] { return new String[] {

0
dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java → dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
View File

0
dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy → dd-java-agent/instrumentation/datastax-cassandra-2.3/src/test/groovy/CassandraClientTest.groovy
View File

2
settings.gradle
View File

@ -14,7 +14,7 @@ include ':dd-java-agent:instrumentation:apache-httpclient-4.3'
include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.0' include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.0'
include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.106' include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.106'
include ':dd-java-agent:instrumentation:couchbase-2.0' include ':dd-java-agent:instrumentation:couchbase-2.0'
include ':dd-java-agent:instrumentation:datastax-cassandra-3.2' include ':dd-java-agent:instrumentation:datastax-cassandra-2.3'
include ':dd-java-agent:instrumentation:elasticsearch-rest-5' include ':dd-java-agent:instrumentation:elasticsearch-rest-5'
include ':dd-java-agent:instrumentation:elasticsearch-transport-2' include ':dd-java-agent:instrumentation:elasticsearch-transport-2'
include ':dd-java-agent:instrumentation:elasticsearch-transport-5' include ':dd-java-agent:instrumentation:elasticsearch-transport-5'