diff --git a/dd-java-agent/instrumentation/sparkjava-2.4/sparkjava-2.4.gradle b/dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle similarity index 90% rename from dd-java-agent/instrumentation/sparkjava-2.4/sparkjava-2.4.gradle rename to dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle index dbb05a28d7..b595445aff 100644 --- a/dd-java-agent/instrumentation/sparkjava-2.4/sparkjava-2.4.gradle +++ b/dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle @@ -1,8 +1,9 @@ +// 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 diff --git a/dd-java-agent/instrumentation/sparkjava-2.4/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java b/dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/sparkjava-2.4/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java rename to dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java diff --git a/dd-java-agent/instrumentation/sparkjava-2.4/src/test/groovy/SparkJavaBasedTest.groovy b/dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/sparkjava-2.4/src/test/groovy/SparkJavaBasedTest.groovy rename to dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy diff --git a/dd-java-agent/instrumentation/sparkjava-2.4/src/test/java/TestSparkJavaApplication.java b/dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java similarity index 100% rename from dd-java-agent/instrumentation/sparkjava-2.4/src/test/java/TestSparkJavaApplication.java rename to dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java diff --git a/settings.gradle b/settings.gradle index 113b70f74b..fb91efd0e6 100644 --- a/settings.gradle +++ b/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'