From c18b299606b9630cbfe478caa14ec07ee5b751c9 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Fri, 4 Jan 2019 11:08:21 -0800 Subject: [PATCH] Also exclude test coverage from instrumentation --- .../java-concurrent/akka-testing/akka-testing.gradle | 2 -- gradle/java.gradle | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle b/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle index 41a57731c8..b6ddf559a6 100644 --- a/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle +++ b/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle @@ -1,8 +1,6 @@ apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/test-with-scala.gradle" -excludedClassesConverage += ['*'] - dependencies { testCompile project(':dd-trace-api') testCompile project(':dd-trace-ot') diff --git a/gradle/java.gradle b/gradle/java.gradle index b70c9eb591..801308636a 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -4,7 +4,9 @@ apply plugin: 'groovy' apply from: "$rootDir/gradle/checkstyle.gradle" apply from: "$rootDir/gradle/codenarc.gradle" -def applyCodeCoverage = !project.plugins.hasPlugin('com.github.johnrengelman.shadow') +def applyCodeCoverage = !(project.plugins.hasPlugin('com.github.johnrengelman.shadow') + || project.path.startsWith(":dd-java-agent:instrumentation:")) + if (applyCodeCoverage) { apply from: "$rootDir/gradle/jacoco.gradle" } @@ -234,7 +236,7 @@ for (def env : System.getenv().entrySet()) { description "Runs $clonedTask.name under java ${javaName}" executable = javaPath onlyIf { isJavaVersionAllowed(javaVersion) && isTestingEnabled(javaName) } - if(applyCodeCoverage) { + if (applyCodeCoverage) { jacoco { // Disable jacoco for additional JVM tests to speed things up a bit enabled = false