From 155f0c3af81cbf43df005fbd94c670377fb81caa Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Wed, 5 Jun 2019 12:38:07 -0400 Subject: [PATCH 1/4] Use newer jacoco --- gradle/jacoco.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle index ef388b93cb..50af6b6d2d 100644 --- a/gradle/jacoco.gradle +++ b/gradle/jacoco.gradle @@ -1,7 +1,7 @@ apply plugin: "jacoco" jacoco { - toolVersion = "0.8.2" + toolVersion = "0.8.4" } jacocoTestReport { From 15504c004a8a5ebf16a9294b6e6995bc77cc0db2 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Wed, 5 Jun 2019 12:43:50 -0400 Subject: [PATCH 2/4] Simplify jacoco code a bit --- gradle/jacoco.gradle | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle index 50af6b6d2d..6ea2d836ff 100644 --- a/gradle/jacoco.gradle +++ b/gradle/jacoco.gradle @@ -13,21 +13,15 @@ jacocoTestReport { } } -if (project.parent.hasProperty("excludedClassesConverage")) { - project.ext.excludedClassesConverage = parent.excludedClassesConverage -} else { +if (!project.hasProperty("excludedClassesConverage")) { project.ext.excludedClassesConverage = [] } -if (project.parent.hasProperty("excludedClassesBranchConverage")) { - project.ext.excludedClassesBranchConverage = parent.excludedClassesBranchConverage -} else { +if (!project.hasProperty("excludedClassesBranchConverage")) { project.ext.excludedClassesBranchConverage = [] } -if (project.parent.hasProperty("excludedClassesInstructionConverage")) { - project.ext.excludedClassesInstructionConverage = parent.excludedClassesInstructionConverage -} else { +if (!project.hasProperty("excludedClassesInstructionConverage")) { project.ext.excludedClassesInstructionConverage = [] } From 7863a68a5315f8dd5e0c20134c62e2c1a8148e85 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Thu, 6 Jun 2019 09:41:36 -0400 Subject: [PATCH 3/4] Fix typo --- .../agent-tooling/agent-tooling.gradle | 2 +- dd-java-agent/testing/testing.gradle | 2 +- dd-trace-api/dd-trace-api.gradle | 2 +- dd-trace-ot/dd-trace-ot.gradle | 2 +- dd-trace/dd-trace.gradle | 4 ++-- gradle/jacoco.gradle | 18 +++++++++--------- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dd-java-agent/agent-tooling/agent-tooling.gradle b/dd-java-agent/agent-tooling/agent-tooling.gradle index 701ab60c23..182a5b97a4 100644 --- a/dd-java-agent/agent-tooling/agent-tooling.gradle +++ b/dd-java-agent/agent-tooling/agent-tooling.gradle @@ -1,7 +1,7 @@ apply from: "${rootDir}/gradle/java.gradle" minimumBranchCoverage = 0.6 -excludedClassesConverage += ['datadog.trace.agent.tooling.*'] +excludedClassesCoverage += ['datadog.trace.agent.tooling.*'] configurations { // classpath used by the instrumentation muzzle plugin diff --git a/dd-java-agent/testing/testing.gradle b/dd-java-agent/testing/testing.gradle index da8acefcac..ab4818e1f1 100644 --- a/dd-java-agent/testing/testing.gradle +++ b/dd-java-agent/testing/testing.gradle @@ -2,7 +2,7 @@ apply from: "${rootDir}/gradle/java.gradle" minimumBranchCoverage = 0.5 minimumInstructionCoverage = 0.5 -excludedClassesConverage += [ +excludedClassesCoverage += [ 'datadog.trace.agent.test.asserts.*Assert', 'datadog.trace.agent.test.base.*', 'datadog.trace.agent.test.AgentTestRunner.ErrorCountingListener', diff --git a/dd-trace-api/dd-trace-api.gradle b/dd-trace-api/dd-trace-api.gradle index e9c3f9e03f..55eaef01f4 100644 --- a/dd-trace-api/dd-trace-api.gradle +++ b/dd-trace-api/dd-trace-api.gradle @@ -4,7 +4,7 @@ apply from: "${rootDir}/gradle/publish.gradle" minimumBranchCoverage = 0.8 // These are tested outside of this module since this module mainly just defines 'API' -excludedClassesConverage += [ +excludedClassesCoverage += [ 'datadog.trace.api.DDSpanTypes', 'datadog.trace.api.DDTraceApiInfo', 'datadog.trace.api.GlobalTracer*', diff --git a/dd-trace-ot/dd-trace-ot.gradle b/dd-trace-ot/dd-trace-ot.gradle index aaa8f2edb3..7032a7886e 100644 --- a/dd-trace-ot/dd-trace-ot.gradle +++ b/dd-trace-ot/dd-trace-ot.gradle @@ -9,7 +9,7 @@ apply from: "${rootDir}/gradle/publish.gradle" minimumBranchCoverage = 0.5 minimumInstructionCoverage = 0.6 -excludedClassesConverage += [ +excludedClassesCoverage += [ 'datadog.trace.common.writer.ListWriter', 'datadog.trace.common.writer.LoggingWriter', 'datadog.trace.common.sampling.PrioritySampling', diff --git a/dd-trace/dd-trace.gradle b/dd-trace/dd-trace.gradle index 66dfa2793b..9fdd62e08a 100644 --- a/dd-trace/dd-trace.gradle +++ b/dd-trace/dd-trace.gradle @@ -3,7 +3,7 @@ apply from: "${rootDir}/gradle/java.gradle" minimumBranchCoverage = 0.9 minimumInstructionCoverage = 0.9 -excludedClassesConverage += [ +excludedClassesCoverage += [ 'datadog.trace.tracer.Tracer.TracerBuilder', 'datadog.trace.decorator.*', // TODO: remove when ready to write tests. ] @@ -19,7 +19,7 @@ dependencies { compile group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.16' compile project(':utils:gc-utils') - + // Spock uses that for mocking testCompile deps.bytebuddy testCompile group: 'org.objenesis', name: 'objenesis', version: '2.6' // Last version to support Java7 diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle index 6ea2d836ff..e946702d49 100644 --- a/gradle/jacoco.gradle +++ b/gradle/jacoco.gradle @@ -13,16 +13,16 @@ jacocoTestReport { } } -if (!project.hasProperty("excludedClassesConverage")) { - project.ext.excludedClassesConverage = [] +if (!project.hasProperty("excludedClassesCoverage")) { + project.ext.excludedClassesCoverage = [] } -if (!project.hasProperty("excludedClassesBranchConverage")) { - project.ext.excludedClassesBranchConverage = [] +if (!project.hasProperty("excludedClassesBranchCoverage")) { + project.ext.excludedClassesBranchCoverage = [] } -if (!project.hasProperty("excludedClassesInstructionConverage")) { - project.ext.excludedClassesInstructionConverage = [] +if (!project.hasProperty("excludedClassesInstructionCoverage")) { + project.ext.excludedClassesInstructionCoverage = [] } // defaults can be overridden per project: @@ -33,7 +33,7 @@ afterEvaluate { test { jacoco { // Make sure that excluded classes do not get jacoc instrumentation applied since it may confuse apm agent in some cases - excludes = project.excludedClassesConverage + excludes = project.excludedClassesCoverage } } @@ -41,7 +41,7 @@ afterEvaluate { violationRules { rule { element = 'CLASS' - excludes = project.excludedClassesBranchConverage + project.excludedClassesConverage + excludes = project.excludedClassesBranchCoverage + project.excludedClassesCoverage limit { counter = 'BRANCH' minimum = project.minimumBranchCoverage @@ -50,7 +50,7 @@ afterEvaluate { rule { element = 'CLASS' - excludes = project.excludedClassesInstructionConverage + project.excludedClassesConverage + excludes = project.excludedClassesInstructionCoverage + project.excludedClassesCoverage limit { counter = 'INSTRUCTION' minimum = project.minimumInstructionCoverage From eddf5d98d8dc977b67d71f7de2cb2865d3e0c353 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Thu, 6 Jun 2019 10:05:18 -0400 Subject: [PATCH 4/4] Undo akka latest dep hack --- .../instrumentation/akka-http-10.0/akka-http-10.0.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dd-java-agent/instrumentation/akka-http-10.0/akka-http-10.0.gradle b/dd-java-agent/instrumentation/akka-http-10.0/akka-http-10.0.gradle index 6460d45c0b..1766a6dff4 100644 --- a/dd-java-agent/instrumentation/akka-http-10.0/akka-http-10.0.gradle +++ b/dd-java-agent/instrumentation/akka-http-10.0/akka-http-10.0.gradle @@ -90,9 +90,7 @@ dependencies { version101TestCompile project(':dd-java-agent:instrumentation:java-concurrent') version101TestCompile project(':dd-java-agent:instrumentation:trace-annotation') - // Lock latest dep on '10.1.6' because '10.1.6+21-f063bff5' was released that breaks things - // Once 10.1.7 is released we should be able to go back to '+' - latestDepTestCompile group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.1.6' + latestDepTestCompile group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '+' latestDepTestCompile group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '+' latestDepTestCompile project(':dd-java-agent:testing') latestDepTestCompile project(':dd-java-agent:instrumentation:java-concurrent')