open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly limit heap size for gradle child processes

This commit is contained in:
Nikolay Martynov 2018-11-22 08:43:06 -05:00
parent 80cd7cd500
commit ed5692871d
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.circleci/config.yml
View File

@ -25,7 +25,7 @@ jobs:
- run: - run:
name: Build Project 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=8 command: GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms64M' -Ddatadog.forkedMaxHeapSize=1G -Ddatadog.forkedMinHeapSize=64M" ./gradlew clean :dd-java-agent:shadowJar compileTestGroovy compileTestScala compileTestJava --build-cache --parallel --stacktrace --no-daemon --max-workers=8
- run: - run:
name: Collect Libs name: Collect Libs
@ -66,7 +66,7 @@ jobs:
- run: - run:
name: Run Tests name: Run Tests
command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx4G -Xms512M" ./gradlew $TEST_TASK --build-cache --parallel --stacktrace --no-daemon --max-workers=6 command: GRADLE_OPTS="-Ddatadog.forkedMaxHeapSize=4G -Ddatadog.forkedMinHeapSize=64M" ./gradlew $TEST_TASK --build-cache --parallel --stacktrace --no-daemon --max-workers=6
- run: - run:
name: Collect Reports name: Collect Reports
@ -162,7 +162,7 @@ jobs:
- run: - run:
name: Build Project name: Build Project
command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx4G -Xms64M" ./gradlew check -PskipTests --build-cache --parallel --stacktrace --no-daemon --max-workers=8 command: GRADLE_OPTS="-Ddatadog.forkedMaxHeapSize=4G -Ddatadog.forkedMinHeapSize=64M" ./gradlew check -PskipTests --build-cache --parallel --stacktrace --no-daemon --max-workers=8
- run: - run:
name: Collect Reports name: Collect Reports
@ -184,7 +184,7 @@ jobs:
- run: - run:
name: Verify Version Scan name: Verify Version Scan
command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx4G -Xms64M" ./gradlew verifyVersionScan --parallel --stacktrace --no-daemon --max-workers=8 command: GRADLE_OPTS="-Ddatadog.forkedMaxHeapSize=4G -Ddatadog.forkedMinHeapSize=64M" ./gradlew verifyVersionScan --parallel --stacktrace --no-daemon --max-workers=8
- save_cache: - save_cache:
key: dd-trace-java-version-scan-{{ checksum "dd-trace-java.gradle" }} key: dd-trace-java-version-scan-{{ checksum "dd-trace-java.gradle" }}
@ -205,7 +205,7 @@ jobs:
# Note: we do not have `--max-workers` here to have number of workers (threads) equal to number of CPUs (32 currently). # Note: we do not have `--max-workers` here to have number of workers (threads) equal to number of CPUs (32 currently).
# This should speed things up slightly because muzzle may do a lot of IO bound work: reading off disk and downloading # This should speed things up slightly because muzzle may do a lot of IO bound work: reading off disk and downloading
# dependencies. # dependencies.
command: SKIP_BUILDSCAN="true" GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx8G -Xms64M" ./gradlew muzzle --parallel --stacktrace --no-daemon command: SKIP_BUILDSCAN="true" GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx8G -Xms64M' -Ddatadog.forkedMaxHeapSize=4G -Ddatadog.forkedMinHeapSize=64M" ./gradlew muzzle --parallel --stacktrace --no-daemon
- save_cache: - save_cache:
key: dd-trace-java-muzzle-{{ checksum "dd-trace-java.gradle" }} key: dd-trace-java-muzzle-{{ checksum "dd-trace-java.gradle" }}

7
dd-trace-java.gradle
View File

@ -55,3 +55,10 @@ ext.gradleWrapperVersion = '4.10.2'
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = gradleWrapperVersion gradleVersion = gradleWrapperVersion
} }
allprojects {
tasks.withType(JavaForkOptions) {
maxHeapSize = System.properties["datadog.forkedMaxHeapSize"]
minHeapSize = System.properties["datadog.forkedMinHeapSize"]
}
}

5
gradle/java.gradle
View File

@ -121,10 +121,10 @@ artifacts {
project.afterEvaluate { project.afterEvaluate {
if (project.plugins.hasPlugin('org.unbroken-dome.test-sets') && configurations.hasProperty("latestDepTestRuntime")) { if (project.plugins.hasPlugin('org.unbroken-dome.test-sets') && configurations.hasProperty("latestDepTestRuntime")) {
tasks.withType(Test) { tasks.withType(Test) {
doFirst{ doFirst {
def testArtifacts = configurations.testRuntime.resolvedConfiguration.resolvedArtifacts def testArtifacts = configurations.testRuntime.resolvedConfiguration.resolvedArtifacts
def latestTestArtifacts = configurations.latestDepTestRuntime.resolvedConfiguration.resolvedArtifacts def latestTestArtifacts = configurations.latestDepTestRuntime.resolvedConfiguration.resolvedArtifacts
assert testArtifacts != latestTestArtifacts : "latestDepTest dependencies are identical to test" assert testArtifacts != latestTestArtifacts: "latestDepTest dependencies are identical to test"
} }
} }
} }
@ -267,3 +267,4 @@ plugins.withType(BasePlugin) {
otherTasks*.mustRunAfter deleteTasks otherTasks*.mustRunAfter deleteTasks
} }
} }