more

Author: trask

instrumentation/quarkus-resteasy-reactive/quarkus2-testing/build.gradle.kts

@@ -38,31 +38,39 @@ val quarkusTestBaseRuntimeClasspathConfiguration by configurations.creating {
 val quarkusTestCompileOnlyConfiguration by configurations.creating {
 }
 
-val testModelPath = layout.buildDirectory.file("quarkus-app-test-model.dat").get().asFile.toPath()
+val testModelPath = layout.buildDirectory.file("quarkus-app-test-model.dat")
 
-val buildModel = tasks.register("buildModel") {
-  dependsOn(configurations.named("testRuntimeClasspath"))
+abstract class BuildQuarkusModelTask : DefaultTask() {
+  @get:OutputFile
+  abstract val modelFile: RegularFileProperty
 
-  if (testModelPath.notExists()) {
-    doLast {
+  @TaskAction
+  fun buildModel() {
+    val modelPath = modelFile.get().asFile.toPath()
+    if (modelPath.notExists()) {
       val modelParameter = ModelParameterImpl()
       modelParameter.mode = LaunchMode.TEST.toString()
       val model = GradleApplicationModelBuilder().buildAll(
         ApplicationModel::class.java.getName(),
         modelParameter,
         project
       )
-      BootstrapUtils.serializeAppModel(model as ApplicationModel?, testModelPath)
+      BootstrapUtils.serializeAppModel(model as ApplicationModel?, modelPath)
     }
   }
-  outputs.file(testModelPath)
+}
+
+val buildModel = tasks.register<BuildQuarkusModelTask>("buildModel") {
+  dependsOn(configurations.named("testRuntimeClasspath"))
+  modelFile.set(testModelPath)
+  notCompatibleWithConfigurationCache("Uses Quarkus GradleApplicationModelBuilder which requires Project at execution time")
 }
 
 tasks {
   test {
     dependsOn(buildModel)
 
-    systemProperty("quarkus-internal-test.serialized-app-model.path", testModelPath.toString())
+    systemProperty("quarkus-internal-test.serialized-app-model.path", testModelPath.get().asFile.absolutePath)
   }
 
   if (findProperty("denyUnsafe") as Boolean) {

instrumentation/quarkus-resteasy-reactive/quarkus3-testing/build.gradle.kts

@@ -45,31 +45,39 @@ val quarkusTestBaseRuntimeClasspathConfiguration by configurations.creating {
 val quarkusTestCompileOnlyConfiguration by configurations.creating {
 }
 
-val testModelPath = layout.buildDirectory.file("quarkus-app-test-model.dat").get().asFile.toPath()
+val testModelPath = layout.buildDirectory.file("quarkus-app-test-model.dat")
 
-val buildModel = tasks.register("buildModel") {
-  dependsOn(configurations.named("testRuntimeClasspath"))
+abstract class BuildQuarkusModelTask : DefaultTask() {
+  @get:OutputFile
+  abstract val modelFile: RegularFileProperty
 
-  if (testModelPath.notExists()) {
-    doLast {
+  @TaskAction
+  fun buildModel() {
+    val modelPath = modelFile.get().asFile.toPath()
+    if (modelPath.notExists()) {
       val modelParameter = ModelParameterImpl()
       modelParameter.mode = LaunchMode.TEST.toString()
       val model = GradleApplicationModelBuilder().buildAll(
         ApplicationModel::class.java.getName(),
         modelParameter,
         project
       )
-      BootstrapUtils.serializeAppModel(model as ApplicationModel?, testModelPath)
+      BootstrapUtils.serializeAppModel(model as ApplicationModel?, modelPath)
     }
   }
-  outputs.file(testModelPath)
+}
+
+val buildModel = tasks.register<BuildQuarkusModelTask>("buildModel") {
+  dependsOn(configurations.named("testRuntimeClasspath"))
+  modelFile.set(testModelPath)
+  notCompatibleWithConfigurationCache("Uses Quarkus GradleApplicationModelBuilder which requires Project at execution time")
 }
 
 tasks {
   test {
     dependsOn(buildModel)
 
-    systemProperty("quarkus-internal-test.serialized-app-model.path", testModelPath.toString())
+    systemProperty("quarkus-internal-test.serialized-app-model.path", testModelPath.get().asFile.absolutePath)
   }
 
   if (findProperty("denyUnsafe") as Boolean) {

testing/agent-for-testing/build.gradle.kts

@@ -24,21 +24,76 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-api")
 }
 
+abstract class ExtractAgentJar : DefaultTask() {
+  @get:InputFiles
+  @get:PathSensitive(PathSensitivity.NONE)
+  abstract val agentJar: ConfigurableFileCollection
+
+  @get:OutputDirectory
+  abstract val extractDir: DirectoryProperty
+
+  @get:Inject
+  abstract val archiveOperations: ArchiveOperations
+
+  @get:Inject
+  abstract val fileSystemOperations: FileSystemOperations
+
+  @TaskAction
+  fun extract() {
+    fileSystemOperations.sync {
+      from(archiveOperations.zipTree(agentJar.singleFile))
+      into(extractDir)
+    }
+  }
+}
+
+abstract class ExtractAgentManifest : DefaultTask() {
+  @get:InputFiles
+  @get:PathSensitive(PathSensitivity.NONE)
+  abstract val agentJar: ConfigurableFileCollection
+
+  @get:OutputFile
+  abstract val manifestFile: RegularFileProperty
+
+  @get:Inject
+  abstract val archiveOperations: ArchiveOperations
+
+  @get:Inject
+  abstract val fileSystemOperations: FileSystemOperations
+
+  @TaskAction
+  fun extract() {
+    fileSystemOperations.copy {
+      from(archiveOperations.zipTree(agentJar.singleFile))
+      include("META-INF/MANIFEST.MF")
+      into(temporaryDir)
+    }
+    manifestFile.get().asFile.writeBytes(
+      temporaryDir.resolve("META-INF/MANIFEST.MF").readBytes()
+    )
+  }
+}
+
+val extractAgent = tasks.register<ExtractAgentJar>("extractAgent") {
+  agentJar.from(agent)
+  extractDir.set(layout.buildDirectory.dir("tmp/agent-extracted"))
+}
+
+val extractManifest = tasks.register<ExtractAgentManifest>("extractManifest") {
+  agentJar.from(agent)
+  manifestFile.set(layout.buildDirectory.file("tmp/agent-manifest/MANIFEST.MF"))
+}
+
 tasks {
   jar {
-    dependsOn(agent)
-    from(agent.elements.map { zipTree(it.single()) })
+    dependsOn(extractAgent)
+    from(extractAgent.flatMap { it.extractDir })
     from(extensionLibs) {
       into("extensions")
     }
 
-    manifest.from(
-      agent.elements.map {
-        zipTree(it.single()).matching {
-          include("META-INF/MANIFEST.MF")
-        }.singleFile
-      }
-    )
+    dependsOn(extractManifest)
+    manifest.from(extractManifest.flatMap { it.manifestFile })
   }
 
   afterEvaluate {