Speed up integ tests by reducing scope for annotation scan.

tylerbenson · tylerbenson · commit 2d3a12f3f115 · 2017-09-05T16:35:32.000-07:00
diff --git a/dd-java-agent-ittests/dd-java-agent-ittests.gradle b/dd-java-agent-ittests/dd-java-agent-ittests.gradle
@@ -50,7 +50,7 @@ test {
   }
 
   if (project.hasProperty("disableShadowRelocate") && disableShadowRelocate) {
-    exclude 'com/datadoghq/trace/agent/ShadowPackageRenamingTest.class'
+    exclude 'com/datadoghq/trace/agent/test/ShadowPackageRenamingTest.class'
   }
 }
 
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/SayTracedHello.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/SayTracedHello.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent;
+package com.datadoghq.trace.agent.test;
 
 import com.datadoghq.trace.DDTags;
 import com.datadoghq.trace.Trace;
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/ShadowPackageRenamingTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/ShadowPackageRenamingTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent;
+package com.datadoghq.trace.agent.test;
 
 import com.google.common.collect.MapMaker;
 import org.junit.Assert;
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/TraceAnnotationsManagerTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/TraceAnnotationsManagerTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent;
+package com.datadoghq.trace.agent.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/AWSInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/AWSInstrumentationTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent.integration;
+package com.datadoghq.trace.agent.test.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/ApacheHTTPClientTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/ApacheHTTPClientTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent.integration;
+package com.datadoghq.trace.agent.test.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/CassandraIntegrationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/CassandraIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent.integration;
+package com.datadoghq.trace.agent.test.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/JMSInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/JMSInstrumentationTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent.integration;
+package com.datadoghq.trace.agent.test.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/JettyServletInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/JettyServletInstrumentationTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent.integration;
+package com.datadoghq.trace.agent.test.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/MongoClientInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/MongoClientInstrumentationTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent.integration;
+package com.datadoghq.trace.agent.test.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/OkHTTPInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/OkHTTPInstrumentationTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent.integration;
+package com.datadoghq.trace.agent.test.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/TomcatServletInstrumentationTest.java b/dd-java-agent-ittests/src/test/java/com/datadoghq/trace/agent/test/integration/TomcatServletInstrumentationTest.java
@@ -1,4 +1,4 @@
-package com.datadoghq.trace.agent.integration;
+package com.datadoghq.trace.agent.test.integration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/dd-java-agent-ittests/src/test/resources/dd-trace.yaml b/dd-java-agent-ittests/src/test/resources/dd-trace.yaml
@@ -21,7 +21,7 @@ sampler:
   # skipTagsPatterns: {"http.url": ".*/demo/add.*"}
   
 # Enable custom annotation tracing over a selected set of packages
-enableCustomAnnotationTracingOver: ["com.datadoghq.trace.agent"]
+enableCustomAnnotationTracingOver: ["com.datadoghq.trace.agent.test"]
 
 # Disable some instrumentations
-# disabledInstrumentations: ["apache http", "mongo", "jetty", "tomcat", ...]
+# disabledInstrumentations: ["apache http", "mongo", "jetty", "tomcat", ...]

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ test {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if (project.hasProperty("disableShadowRelocate") && disableShadowRelocate) {`
`53`		`- exclude 'com/datadoghq/trace/agent/ShadowPackageRenamingTest.class'`
	`53`	`+ exclude 'com/datadoghq/trace/agent/test/ShadowPackageRenamingTest.class'`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.datadoghq.trace.agent;`
	`1`	`+package com.datadoghq.trace.agent.test;`
`2`	`2`
`3`	`3`	`import com.datadoghq.trace.DDTags;`
`4`	`4`	`import com.datadoghq.trace.Trace;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.datadoghq.trace.agent.integration;`
	`1`	`+package com.datadoghq.trace.agent.test.integration;`
`2`	`2`
`3`	`3`	`import static org.assertj.core.api.Assertions.assertThat;`
`4`	`4`