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

Merge remote-tracking branch 'origin/tyler/worker-count' into mar-kolya/weak-concurrent-map-thread-cleanup

This commit is contained in:
Nikolay Martynov 2018-10-23 17:45:53 -04:00
parent fc13d7db2b c80d549e46
commit bfaffb8544
3 changed files with 6 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=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: - 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=-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: - run:
name: Collect Reports name: Collect Reports
@ -130,7 +130,7 @@ jobs:
- run: - run:
name: Run Trace Agent Tests 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: - 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=-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: - 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=2 command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx4G -Xms64M" ./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" }}

1
dd-trace-java.gradle
View File

@ -1,4 +1,3 @@
plugins { plugins {
id 'io.franzbecker.gradle-lombok' version '1.13' id 'io.franzbecker.gradle-lombok' version '1.13'
id 'com.jfrog.artifactory' version '4.7.5' id 'com.jfrog.artifactory' version '4.7.5'

2
gradle/java.gradle
View File

@ -145,6 +145,7 @@ if (project.parent && project.parent.hasProperty("javaExecutableVersionCache"))
} else { } else {
project.ext.javaExecutableVersionCache = [:] project.ext.javaExecutableVersionCache = [:]
} }
def getJavaExecutableVersion(String path) { def getJavaExecutableVersion(String path) {
def cache = project.ext.javaExecutableVersionCache def cache = project.ext.javaExecutableVersionCache
@ -177,7 +178,6 @@ def isJavaVersionAllowed(JavaVersion version) {
return true return true
} }
// JVM names we would like to run complete test suite on // JVM names we would like to run complete test suite on
// Note: complete test suite is always run on JVM used for compilation // 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 // Note2: apparently there is no way to have a 'global' variable, so instead we have per project