Merge pull request #492 from DataDog/gary/muzzle-sparkjava

Muzzle and Expand Spark Java Instrumentation

Author: gary-huang

…ation/sparkjava-2.4/sparkjava-2.4.gradle …ation/sparkjava-2.3/sparkjava-2.3.gradledd-java-agent/instrumentation/sparkjava-2.4/sparkjava-2.4.gradle renamed to dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle dd-java-agent/instrumentation/sparkjava-2.4/sparkjava-2.4.gradle renamed to dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle

@@ -1,12 +1,11 @@
-apply plugin: 'version-scan'
-
-versionScan {
-  group = "com.sparkjava"
-  module = 'spark-core'
-  versions = "[2.4,)"
-  verifyPresent = [
-    "spark.route.Routes": null
-  ]
+// building against 2.3 and testing against 2.4 because JettyHandler is available since 2.4 only
+muzzle {
+  pass {
+    group = "com.sparkjava"
+    module = 'spark-core'
+    versions = "[2.3,)"
+    assertInverse = true
+  }
 }
 
 apply from: "${rootDir}/gradle/java.gradle"
@@ -37,7 +36,7 @@ compileJava {
 }
 
 dependencies {
-  compileOnly group: 'com.sparkjava', name: 'spark-core', version: '2.4'
+  compileOnly group: 'com.sparkjava', name: 'spark-core', version: '2.3'
 
   compile project(':dd-java-agent:agent-tooling')
   compile deps.bytebuddy

…ion/sparkjava/RoutesInstrumentation.java …ion/sparkjava/RoutesInstrumentation.javadd-java-agent/instrumentation/sparkjava-2.4/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java renamed to dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java dd-java-agent/instrumentation/sparkjava-2.4/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java renamed to dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java

@@ -49,7 +49,7 @@ include ':dd-java-agent:instrumentation:play-2.4'
 include ':dd-java-agent:instrumentation:ratpack-1.4'
 include ':dd-java-agent:instrumentation:servlet-2'
 include ':dd-java-agent:instrumentation:servlet-3'
-include ':dd-java-agent:instrumentation:sparkjava-2.4'
+include ':dd-java-agent:instrumentation:sparkjava-2.3'
 include ':dd-java-agent:instrumentation:spring-web'
 include ':dd-java-agent:instrumentation:spring-webflux'
 include ':dd-java-agent:instrumentation:spymemcached-2.12'