From c80d549e469b1ca467ef9270b2306a5221117bbf Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler.benson@datadoghq.com>
Date: Tue, 23 Oct 2018 18:03:09 +1000
Subject: [PATCH] Attempt to increase worker count to improve build time.

The build scans are especially slow.
---
 .circleci/config.yml | 10 +++++-----
 dd-trace-java.gradle |  1 -
 gradle/java.gradle   |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a9a4feed64..b2699a6204 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
 
     - run:
         name: Build Project
-        command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx1G -Xms64M" ./gradlew clean :dd-java-agent:shadowJar compileTestGroovy compileTestScala compileTestJava --build-cache --parallel --stacktrace --no-daemon --max-workers=4
+        command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx1G -Xms64M" ./gradlew clean :dd-java-agent:shadowJar compileTestGroovy compileTestScala compileTestJava --build-cache --parallel --stacktrace --no-daemon --max-workers=8
 
     - run:
         name: Collect Libs
@@ -66,7 +66,7 @@ jobs:
 
     - run:
         name: Run Tests
-        command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew $TEST_TASK --build-cache --parallel --stacktrace --no-daemon --max-workers=3
+        command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew $TEST_TASK --build-cache --parallel --stacktrace --no-daemon --max-workers=6
 
     - run:
         name: Collect Reports
@@ -130,7 +130,7 @@ jobs:
 
     - run:
         name: Run Trace Agent Tests
-        command: ./gradlew traceAgentTest --build-cache --parallel --stacktrace --no-daemon --max-workers=6
+        command: ./gradlew traceAgentTest --build-cache --parallel --stacktrace --no-daemon --max-workers=8
 
     - run:
         name: Collect Reports
@@ -162,7 +162,7 @@ jobs:
 
     - run:
         name: Build Project
-        command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx1G -Xms64M" ./gradlew check -PskipTests --build-cache --parallel --stacktrace --no-daemon --max-workers=4
+        command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx1G -Xms64M" ./gradlew check -PskipTests --build-cache --parallel --stacktrace --no-daemon --max-workers=8
 
     - run:
         name: Collect Reports
@@ -184,7 +184,7 @@ jobs:
 
     - run:
         name: Verify Version Scan and Muzzle
-        command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx4G -Xms64M" ./gradlew verifyVersionScan muzzle --parallel --stacktrace --no-daemon --max-workers=2
+        command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx4G -Xms64M" ./gradlew verifyVersionScan muzzle --parallel --stacktrace --no-daemon --max-workers=8
 
     - save_cache:
         key: dd-trace-java-version-scan-{{ checksum "dd-trace-java.gradle" }}
diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle
index c17245754e..92e8e334fe 100644
--- a/dd-trace-java.gradle
+++ b/dd-trace-java.gradle
@@ -1,4 +1,3 @@
-
 plugins {
   id 'io.franzbecker.gradle-lombok' version '1.13'
   id 'com.jfrog.artifactory' version '4.7.5'
diff --git a/gradle/java.gradle b/gradle/java.gradle
index cad483c3e6..66ab701016 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -145,6 +145,7 @@ if (project.parent && project.parent.hasProperty("javaExecutableVersionCache"))
 } else {
   project.ext.javaExecutableVersionCache = [:]
 }
+
 def getJavaExecutableVersion(String path) {
   def cache = project.ext.javaExecutableVersionCache
 
@@ -177,7 +178,6 @@ def isJavaVersionAllowed(JavaVersion version) {
   return true
 }
 
-
 // JVM names we would like to run complete test suite on
 // Note: complete test suite is always run on JVM used for compilation
 // Note2: apparently there is no way to have a 'global' variable, so instead we have per project