diff --git a/instrumentation/jmx-metrics/library/build.gradle.kts b/instrumentation/jmx-metrics/library/build.gradle.kts index fe34161e7332..6cece2910a24 100644 --- a/instrumentation/jmx-metrics/library/build.gradle.kts +++ b/instrumentation/jmx-metrics/library/build.gradle.kts @@ -19,21 +19,26 @@ dependencies { tasks { test { - // get packaged agent jar for testing - val shadowTask = project(":javaagent").tasks.named("shadowJar").get() - dependsOn(shadowTask) - + val shadowTask = project(":javaagent").tasks.named("shadowJar") val testAppTask = project(":instrumentation:jmx-metrics:testing-webapp").tasks.named("war") + + dependsOn(shadowTask) dependsOn(testAppTask) - inputs.files(layout.files(shadowTask)) + val agentJar = shadowTask.flatMap { it.archiveFile } + val testAppWar = testAppTask.flatMap { it.archiveFile } + + inputs.file(agentJar) .withPropertyName("javaagent") .withNormalizer(ClasspathNormalizer::class) + inputs.file(testAppWar) + .withPropertyName("testWebApp") + .withNormalizer(ClasspathNormalizer::class) - doFirst { - jvmArgs( - "-Dio.opentelemetry.javaagent.path=${shadowTask.archiveFile.get()}", - "-Dio.opentelemetry.testapp.path=${testAppTask.get().archiveFile.get().asFile.absolutePath}" + jvmArgumentProviders += CommandLineArgumentProvider { + listOf( + "-Dio.opentelemetry.javaagent.path=${agentJar.get().asFile.absolutePath}", + "-Dio.opentelemetry.testapp.path=${testAppWar.get().asFile.absolutePath}", ) } }