Fix cassandra supported version
and limit range check to <4.
The latest release (4.0) is not compatible with our instrumentation.
RENAME
dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle
dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle
@@ -9,7 +9,8 @@ muzzle {
pass {
group = "com.datastax.cassandra"
module = "cassandra-driver-core"
- versions = "[2.3.0,)"
+ versions = "[3.0,4.0)"
+ assertInverse = true
}
}
@@ -24,7 +25,7 @@ testSets {
}
dependencies {
- compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
+ compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0'
compile project(':dd-java-agent:agent-tooling')
@@ -37,5 +38,5 @@ dependencies {
testCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
testCompile group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2'
- latestDepTestCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '+'
+ latestDepTestCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.+'
}

RENAME
dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
RENAME
dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
RENAME
dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
RENAME
dd-java-agent/instrumentation/datastax-cassandra-2.3/src/test/groovy/CassandraClientTest.groovy
dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
MODIFY
settings.gradle
settings.gradle
@@ -29,7 +29,7 @@ include ':dd-java-agent:instrumentation:apache-httpclient-4'
include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.0'
include ':dd-java-agent:instrumentation:aws-java-sdk-2.2'
include ':dd-java-agent:instrumentation:couchbase-2.0'
-include ':dd-java-agent:instrumentation:datastax-cassandra-2.3'
+include ':dd-java-agent:instrumentation:datastax-cassandra-3'
include ':dd-java-agent:instrumentation:dropwizard'
include ':dd-java-agent:instrumentation:dropwizard:dropwizard-views'
include ':dd-java-agent:instrumentation:elasticsearch'

Fix cassandra supported version

and limit range check to <4.
The latest release (4.0) is not compatible with our instrumentation.