Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/non-static-config

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

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')

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',

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*',

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',

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.
 ]

gradle/jacoco.gradle

@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-  toolVersion = "0.8.2"
+  toolVersion = "0.8.4"
 }
 
 jacocoTestReport {
@@ -13,22 +13,16 @@ jacocoTestReport {
   }
 }
 
-if (project.parent.hasProperty("excludedClassesConverage")) {
-  project.ext.excludedClassesConverage = parent.excludedClassesConverage
-} else {
-  project.ext.excludedClassesConverage = []
+if (!project.hasProperty("excludedClassesCoverage")) {
+  project.ext.excludedClassesCoverage = []
 }
 
-if (project.parent.hasProperty("excludedClassesBranchConverage")) {
-  project.ext.excludedClassesBranchConverage = parent.excludedClassesBranchConverage
-} else {
-  project.ext.excludedClassesBranchConverage = []
+if (!project.hasProperty("excludedClassesBranchCoverage")) {
+  project.ext.excludedClassesBranchCoverage = []
 }
 
-if (project.parent.hasProperty("excludedClassesInstructionConverage")) {
-  project.ext.excludedClassesInstructionConverage = parent.excludedClassesInstructionConverage
-} else {
-  project.ext.excludedClassesInstructionConverage = []
+if (!project.hasProperty("excludedClassesInstructionCoverage")) {
+  project.ext.excludedClassesInstructionCoverage = []
 }
 
 // defaults can be overridden per project:
@@ -39,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
     }
   }
 
@@ -47,7 +41,7 @@ afterEvaluate {
     violationRules {
       rule {
         element = 'CLASS'
-        excludes = project.excludedClassesBranchConverage + project.excludedClassesConverage
+        excludes = project.excludedClassesBranchCoverage + project.excludedClassesCoverage
         limit {
           counter = 'BRANCH'
           minimum = project.minimumBranchCoverage
@@ -56,7 +50,7 @@ afterEvaluate {
 
       rule {
         element = 'CLASS'
-        excludes = project.excludedClassesInstructionConverage + project.excludedClassesConverage
+        excludes = project.excludedClassesInstructionCoverage + project.excludedClassesCoverage
         limit {
           counter = 'INSTRUCTION'
           minimum = project.minimumInstructionCoverage