Skip to content

Commit 33ab8d0

Browse files
committed
Expand instrumentation version range and rename package
1 parent fe6ee07 commit 33ab8d0

5 files changed

Lines changed: 4 additions & 3 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
// building against 2.3 and testing against 2.4 because JettyHandler is available since 2.4 only
12
muzzle {
23
pass {
34
group = "com.sparkjava"
45
module = 'spark-core'
5-
versions = "[2.4,)"
6+
versions = "[2.3,)"
67
assertInverse = true
78
}
89
}
@@ -35,7 +36,7 @@ compileJava {
3536
}
3637

3738
dependencies {
38-
compileOnly group: 'com.sparkjava', name: 'spark-core', version: '2.4'
39+
compileOnly group: 'com.sparkjava', name: 'spark-core', version: '2.3'
3940

4041
compile project(':dd-java-agent:agent-tooling')
4142
compile deps.bytebuddy

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

File renamed without changes.

dd-java-agent/instrumentation/sparkjava-2.4/src/test/groovy/SparkJavaBasedTest.groovy renamed to dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy

File renamed without changes.

dd-java-agent/instrumentation/sparkjava-2.4/src/test/java/TestSparkJavaApplication.java renamed to dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java

File renamed without changes.

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ include ':dd-java-agent:instrumentation:play-2.4'
4949
include ':dd-java-agent:instrumentation:ratpack-1.4'
5050
include ':dd-java-agent:instrumentation:servlet-2'
5151
include ':dd-java-agent:instrumentation:servlet-3'
52-
include ':dd-java-agent:instrumentation:sparkjava-2.4'
52+
include ':dd-java-agent:instrumentation:sparkjava-2.3'
5353
include ':dd-java-agent:instrumentation:spring-web'
5454
include ':dd-java-agent:instrumentation:spring-webflux'
5555
include ':dd-java-agent:instrumentation:spymemcached-2.12'

0 commit comments

Comments
 (0)