Move dropwizard tests to dropwizard project
This separate directory helps to avoid conflicts with JerseyTest.
ResourceTestRule usage in JerseyTest was causing some odd interactions which resulted in traces not being reported.
MODIFY
dd-java-agent/instrumentation/dropwizard/dropwizard.gradle
dd-java-agent/instrumentation/dropwizard/dropwizard.gradle
apply from: "${rootDir}/gradle/java.gradle"
+
+//apply plugin: 'org.unbroken-dome.test-sets'
+//
+//testSets {
+// latestDepTest {
+// dirName = 'test'
+// }
+//}
+
+dependencies {
+ testCompile project(':dd-java-agent:instrumentation:java-concurrent')
+ testCompile project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
+ testCompile project(':dd-java-agent:instrumentation:servlet:request-3')
+
+ // First version with DropwizardTestSupport:
+ testCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'
+ testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+ testCompile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10'
+
+ // Anything 1.0+ fails with a java.lang.NoClassDefFoundError: org/eclipse/jetty/server/RequestLog
+// latestDepTestCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
+}

RENAME
dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/DropwizardAsyncTest.groovy
dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardAsyncTest.groovy
RENAME
dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/DropwizardTest.groovy
dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy
RENAME
dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/JettyTestInstrumentation.java
dd-java-agent/instrumentation/dropwizard/src/test/groovy/JettyTestInstrumentation.java
MODIFY
dd-java-agent/instrumentation/jax-rs-annotations-2/jax-rs-annotations-2.gradle
dd-java-agent/instrumentation/jax-rs-annotations-2/jax-rs-annotations-2.gradle
@@ -13,13 +13,13 @@ muzzle {
apply from: "${rootDir}/gradle/java.gradle"
-//apply plugin: 'org.unbroken-dome.test-sets'
-//
-//testSets {
-// latestDepTest {
-// dirName = 'test'
-// }
-//}
+apply plugin: 'org.unbroken-dome.test-sets'
+
+testSets {
+ latestDepTest {
+ dirName = 'test'
+ }
+}
dependencies {
compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
@@ -32,6 +32,5 @@ dependencies {
testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
testCompile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10'
- // Anything 1.0+ fails with a java.lang.NoClassDefFoundError: org/eclipse/jetty/server/RequestLog
-// latestDepTestCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
+ latestDepTestCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
}

Move dropwizard tests to dropwizard project

This separate directory helps to avoid conflicts with JerseyTest.
ResourceTestRule usage in JerseyTest was causing some odd interactions which resulted in traces not being reported.