Expand instrumentation version range and rename package
RENAME
dd-java-agent/instrumentation/sparkjava-2.4/sparkjava-2.4.gradle
dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle
+// 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.4,)"
+ versions = "[2.3,)"
assertInverse = true
}
}
@@ -35,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

RENAME
dd-java-agent/instrumentation/sparkjava-2.4/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java
dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java
RENAME
dd-java-agent/instrumentation/sparkjava-2.4/src/test/groovy/SparkJavaBasedTest.groovy
dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy
RENAME
dd-java-agent/instrumentation/sparkjava-2.4/src/test/java/TestSparkJavaApplication.java
dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java
MODIFY
settings.gradle
settings.gradle
@@ -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'

Expand instrumentation version range and rename package