diff --git a/build.gradle b/build.gradle index e20a6bc6c..9065bfc9b 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ buildscript { classpath 'com.palantir.gradle.gitversion:gradle-git-version:4.0.0' classpath 'com.palantir.gradle.idea-configuration:gradle-idea-configuration:0.5.0' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.36.0' - classpath 'me.champeau.gradle:jmh-gradle-plugin:0.5.3' + classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.3' } } diff --git a/changelog/@unreleased/pr-1412.v2.yml b/changelog/@unreleased/pr-1412.v2.yml new file mode 100644 index 000000000..6671e1c87 --- /dev/null +++ b/changelog/@unreleased/pr-1412.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: '`./gradlew jmh` works' + links: + - https://github.com/palantir/tracing-java/pull/1412 diff --git a/tracing-benchmarks/build.gradle b/tracing-benchmarks/build.gradle index 3b4d21dae..c2c38936c 100644 --- a/tracing-benchmarks/build.gradle +++ b/tracing-benchmarks/build.gradle @@ -2,16 +2,21 @@ * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved. */ -apply plugin: 'me.champeau.gradle.jmh' +apply plugin: 'me.champeau.jmh' jmh { // Use profilers to collect additional data. Supported profilers: // [cl, comp, gc, stack, perf, perfnorm, perfasm, xperf, xperfasm, hs_cl, hs_comp, hs_gc, hs_rt, hs_thr] - profilers = ['gc'] + // profilers = ['gc'] + warmupIterations = 10 + warmup = '500ms' + iterations = 10 + timeOnIteration = '750ms' + threads = 4 } tasks.jmhCompileGeneratedClasses { - options.annotationProcessorPath = configurations.errorprone + options.annotationProcessorPath = configurations.jmhAnnotationProcessor options.errorprone.enabled = false } diff --git a/versions.lock b/versions.lock index d0bd4a93d..b7b442486 100644 --- a/versions.lock +++ b/versions.lock @@ -30,7 +30,7 @@ org.jboss.xnio:xnio-api:3.8.7.Final (2 constraints: 771a3146) org.jboss.xnio:xnio-nio:3.8.7.Final (1 constraints: c80dcb30) org.jetbrains:annotations:26.0.2 (2 constraints: 0221656e) org.jspecify:jspecify:1.0.0 (3 constraints: 9f1f57e1) -org.openjdk.jmh:jmh-core:1.37 (5 constraints: 5047ece4) +org.openjdk.jmh:jmh-core:1.37 (5 constraints: 52476be6) org.openjdk.jmh:jmh-generator-annprocess:1.37 (1 constraints: df04fc30) org.slf4j:slf4j-api:2.0.17 (8 constraints: 2875c85f) org.wildfly.client:wildfly-client-config:1.0.1.Final (1 constraints: 940c6308) @@ -111,7 +111,7 @@ org.mockito:mockito-core:5.18.0 (2 constraints: 38148e87) org.mockito:mockito-junit-jupiter:5.18.0 (1 constraints: 4005593b) org.objenesis:objenesis:3.3 (1 constraints: b20a14bd) org.openjdk.jmh:jmh-generator-asm:1.37 (1 constraints: 2c107598) -org.openjdk.jmh:jmh-generator-bytecode:1.37 (1 constraints: dc04f830) +org.openjdk.jmh:jmh-generator-bytecode:1.37 (1 constraints: de04fb30) org.openjdk.jmh:jmh-generator-reflection:1.37 (2 constraints: 491e3064) org.opentest4j:opentest4j:1.3.0 (2 constraints: cf209249) org.ow2.asm:asm:9.0 (2 constraints: 641531ca)