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

Fix cassandra supported version 

and limit range check to <4.
The latest release (4.0) is not compatible with our instrumentation.
This commit is contained in:
Tyler Benson 2019-03-21 17:57:08 -07:00
parent c363f64b50
commit e0d95ceb19
6 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle → dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle
View File

@ -9,7 +9,8 @@ muzzle {
pass { pass {
group = "com.datastax.cassandra" group = "com.datastax.cassandra"
module = "cassandra-driver-core" module = "cassandra-driver-core"
versions = "[2.3.0,)" versions = "[3.0,4.0)"
assertInverse = true
} }
} }
@ -24,7 +25,7 @@ testSets {
} }
dependencies { 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') 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: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
testCompile group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2' 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.+'
} }

0
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
View File

0
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
View File

0
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
View File

0
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
View File

2
settings.gradle
View File

@ -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-1.11.0'
include ':dd-java-agent:instrumentation:aws-java-sdk-2.2' include ':dd-java-agent:instrumentation:aws-java-sdk-2.2'
include ':dd-java-agent:instrumentation:couchbase-2.0' 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'
include ':dd-java-agent:instrumentation:dropwizard:dropwizard-views' include ':dd-java-agent:instrumentation:dropwizard:dropwizard-views'
include ':dd-java-agent:instrumentation:elasticsearch' include ':dd-java-agent:instrumentation:elasticsearch'