diff --git a/dd-java-agent-perftests/README.md b/dd-java-agent/benchmark-integration/README.md similarity index 89% rename from dd-java-agent-perftests/README.md rename to dd-java-agent/benchmark-integration/README.md index 431b15d2c5..f5f0f7f3fa 100644 --- a/dd-java-agent-perftests/README.md +++ b/dd-java-agent/benchmark-integration/README.md @@ -8,7 +8,7 @@ Integration level performance tests for the Datadog Java Agent. ### Example ``` -./gradlew dd-java-agent-perftests:jetty-perftest:shadowJar +./gradlew dd-java-agent:benchmark-integration:jetty-perftest:shadowJar ./run-perf-test.sh jetty-perftest/build/libs/jetty-perftest-0.2.12-SNAPSHOT-all.jar NoAgent ../dd-java-agent/build/libs/dd-java-agent-0.2.12-SNAPSHOT.jar cp /tmp/perf_results.csv ~/somewhere_else/ ``` diff --git a/dd-java-agent-perftests/dd-java-agent-perftests.gradle b/dd-java-agent/benchmark-integration/benchmark-integration.gradle similarity index 87% rename from dd-java-agent-perftests/dd-java-agent-perftests.gradle rename to dd-java-agent/benchmark-integration/benchmark-integration.gradle index 99d6453f24..a1580e7b23 100644 --- a/dd-java-agent-perftests/dd-java-agent-perftests.gradle +++ b/dd-java-agent/benchmark-integration/benchmark-integration.gradle @@ -9,7 +9,7 @@ buildscript { apply from: "${rootDir}/gradle/java.gradle" -description = 'dd-java-agent-perftests' +description = 'Integration Level Agent benchmarks.' sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/dd-java-agent-perftests/jetty-perftest/jetty-perftest.gradle b/dd-java-agent/benchmark-integration/jetty-perftest/jetty-perftest.gradle similarity index 83% rename from dd-java-agent-perftests/jetty-perftest/jetty-perftest.gradle rename to dd-java-agent/benchmark-integration/jetty-perftest/jetty-perftest.gradle index d831cdd83a..27168c3b16 100644 --- a/dd-java-agent-perftests/jetty-perftest/jetty-perftest.gradle +++ b/dd-java-agent/benchmark-integration/jetty-perftest/jetty-perftest.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':dd-java-agent-perftests') + compile project(':dd-java-agent:benchmark-integration') compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120' compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120' } diff --git a/dd-java-agent-perftests/jetty-perftest/src/main/java/dd/perftest/jetty/JettyPerftest.java b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/dd/perftest/jetty/JettyPerftest.java similarity index 100% rename from dd-java-agent-perftests/jetty-perftest/src/main/java/dd/perftest/jetty/JettyPerftest.java rename to dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/dd/perftest/jetty/JettyPerftest.java diff --git a/dd-java-agent-perftests/run-perf-test.sh b/dd-java-agent/benchmark-integration/run-perf-test.sh similarity index 100% rename from dd-java-agent-perftests/run-perf-test.sh rename to dd-java-agent/benchmark-integration/run-perf-test.sh diff --git a/dd-java-agent-perftests/src/main/java/dd/perftest/Worker.java b/dd-java-agent/benchmark-integration/src/main/java/dd/perftest/Worker.java similarity index 100% rename from dd-java-agent-perftests/src/main/java/dd/perftest/Worker.java rename to dd-java-agent/benchmark-integration/src/main/java/dd/perftest/Worker.java diff --git a/settings.gradle b/settings.gradle index d5946c2b51..d80041476e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,11 +3,11 @@ rootProject.name = 'dd-trace-java' include ':dd-trace' include ':dd-java-agent' include ':dd-java-agent:benchmark' +include ':dd-java-agent:benchmark-integration' +include ':dd-java-agent:benchmark-integration:jetty-perftest' include ':dd-java-agent:testing' include ':dd-java-agent:tooling' include ':dd-java-agent-ittests' -include ':dd-java-agent-perftests' -include ':dd-java-agent-perftests:jetty-perftest' include ':dd-trace-examples:dropwizard-mongo-client' include ':dd-trace-examples:spring-boot-jdbc' include ':dd-trace-examples:rest-spark'