From 3ea7ad73edae319cf09a6c9d159aeae7fe5e01e5 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Tue, 28 Nov 2017 18:34:56 -0800 Subject: [PATCH] Fix version scan plugin Now you can run `./gradlew :dd-java-agent:integrations:datastax-cassandra-3.2::scanVersionsReport -PshowClasses` to show you the classes you can use for that version range. --- .../src/main/groovy/VersionScanPlugin.groovy | 10 ++-- .../datastax-cassandra-3.2.gradle | 53 ++++++++++--------- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/buildSrc/src/main/groovy/VersionScanPlugin.groovy b/buildSrc/src/main/groovy/VersionScanPlugin.groovy index 14f5214fa3..8da6e9e3d0 100644 --- a/buildSrc/src/main/groovy/VersionScanPlugin.groovy +++ b/buildSrc/src/main/groovy/VersionScanPlugin.groovy @@ -39,9 +39,9 @@ class VersionScanPlugin implements Plugin { description = "Queries for all versions of configured modules and finds key classes" } - def hasRelevantTask = project.gradle.startParameter.taskNames.contains('scanVersions') - hasRelevantTask |= project.gradle.startParameter.taskNames.contains('scanVersionsReport') - hasRelevantTask |= project.gradle.startParameter.taskNames.contains('verifyVersionScan') + def hasRelevantTask = project.gradle.startParameter.taskNames.any { it.contains('scanVersions') } + hasRelevantTask |= project.gradle.startParameter.taskNames.any { it.contains('scanVersionsReport') } + hasRelevantTask |= project.gradle.startParameter.taskNames.any { it.contains('verifyVersionScan') } if (!hasRelevantTask) { return @@ -80,7 +80,7 @@ class VersionScanPlugin implements Plugin { } } } - if (project.gradle.startParameter.taskNames.contains('scanVersions')) { + if (project.gradle.startParameter.taskNames.any { it.contains('scanVersions') }) { scanVersions.finalizedBy(scanVersionsReport) } @@ -176,7 +176,7 @@ class VersionScanPlugin implements Plugin { } } - if (project.gradle.startParameter.taskNames.contains('scanVersions')) { + if (project.gradle.startParameter.taskNames.any { it.contains('scanVersions') }) { scanVersions.finalizedBy(verifyVersionScan) } } diff --git a/dd-java-agent/integrations/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle b/dd-java-agent/integrations/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle index d58d678dd0..b0aae82e79 100644 --- a/dd-java-agent/integrations/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle +++ b/dd-java-agent/integrations/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle @@ -1,32 +1,33 @@ // TODO: VersionScan plugin does not report which version failed, which is making it hard to get meaningful results out of this block. // Once versionScan can report on which version failed, this can be enabled. // The desire is to apply the instrumentation to cassandra-datastax 2.3 and beyond. -// apply plugin: 'version-scan' -// versionScan { -// group = "com.datastax.cassandra" -// module = "cassandra-driver-core" -// versions = "[3.2.0,)" -// verifyPresent = [ -// // class we're advising -// 'com.datastax.driver.core.Cluster$Manager': null, -// // used by TracingSession -// 'com.datastax.driver.core.BoundStatement' : null, -// 'com.datastax.driver.core.BoundStatement' : null, -// 'com.datastax.driver.core.CloseFuture' : null, -// 'com.datastax.driver.core.Cluster' : null, -// 'com.datastax.driver.core.Host' : null, -// 'com.datastax.driver.core.PreparedStatement' : null, -// 'com.datastax.driver.core.RegularStatement' : null, -// 'com.datastax.driver.core.ResultSet' : null, -// 'com.datastax.driver.core.ResultSetFuture' : null, -// 'com.datastax.driver.core.Session' : null, -// 'com.datastax.driver.core.Statement' : null, -// 'com.google.common.base.Function' : null, -// 'com.google.common.util.concurrent.Futures' : null, -// 'com.google.common.util.concurrent.ListenableFuture' : null -// ] -// } +apply plugin: 'version-scan' + +versionScan { + group = "com.datastax.cassandra" + module = "cassandra-driver-core" + versions = "[3.2.0,)" +// verifyPresent = [ +// // class we're advising +// 'com.datastax.driver.core.Cluster$Manager' : null, +// // used by TracingSession +// 'com.datastax.driver.core.BoundStatement' : null, +// 'com.datastax.driver.core.BoundStatement' : null, +// 'com.datastax.driver.core.CloseFuture' : null, +// 'com.datastax.driver.core.Cluster' : null, +// 'com.datastax.driver.core.Host' : null, +// 'com.datastax.driver.core.PreparedStatement' : null, +// 'com.datastax.driver.core.RegularStatement' : null, +// 'com.datastax.driver.core.ResultSet' : null, +// 'com.datastax.driver.core.ResultSetFuture' : null, +// 'com.datastax.driver.core.Session' : null, +// 'com.datastax.driver.core.Statement' : null, +// 'com.google.common.base.Function' : null, +// 'com.google.common.util.concurrent.Futures' : null, +// 'com.google.common.util.concurrent.ListenableFuture': null +// ] +} apply from: "${rootDir}/gradle/java.gradle" @@ -40,4 +41,4 @@ dependencies { compile deps.bytebuddy compile deps.opentracing -} \ No newline at end of file +}