From 293057eb5720dd7924236e59c5fdeaf02d5db128 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Sun, 16 Nov 2025 19:44:20 -0800
Subject: [PATCH] Gradle config cache: jmx-metrics

---
 .../jmx-metrics/library/build.gradle.kts      | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

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>("shadowJar").get()
-    dependsOn(shadowTask)
-
+    val shadowTask = project(":javaagent").tasks.named<ShadowJar>("shadowJar")
     val testAppTask = project(":instrumentation:jmx-metrics:testing-webapp").tasks.named<War>("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}",
       )
     }
   }