Skip to content

Commit b03c858

Browse files
committed
fix: extension property should not be queried at configuration time
1 parent 046f8eb commit b03c858

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

buildSrc/src/main/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationExtension.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ abstract class CallSiteInstrumentationExtension @Inject constructor(
6565
/**
6666
* The JVM to use to run the call site instrumenter (optional, default JVM used if not set).
6767
*/
68-
abstract val javaVersion: Property<JavaLanguageVersion>
68+
val javaVersion: Property<JavaLanguageVersion> =
69+
objectFactory.property<JavaLanguageVersion>().convention(JavaLanguageVersion.current())
6970

7071
/**
7172
* The JVM arguments to run the call site instrumenter.

buildSrc/src/main/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPlugin.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ abstract class CallSiteInstrumentationPlugin : Plugin<Project>{
143143
description = "Generates call sites from ${mainCompileTask.name}"
144144

145145
// Remote Debug
146-
// jvmArgs("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5005")
146+
if (project.providers.gradleProperty("debugCsiJar").isPresent) {
147+
jvmArgs("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5005")
148+
}
147149

148150
// Task input & output
149151
val output = csiExtension.targetFolder
@@ -152,9 +154,10 @@ abstract class CallSiteInstrumentationPlugin : Plugin<Project>{
152154
outputs.dir(output)
153155

154156
// JavaExec configuration
155-
if (csiExtension.javaVersion.isPresent) {
156-
configureLanguage(this, csiExtension.javaVersion.get())
157-
}
157+
javaLauncher.set(javaToolchains.launcherFor {
158+
languageVersion.set(csiExtension.javaVersion)
159+
})
160+
158161
jvmArgumentProviders.add({ csiExtension.jvmArgs.get() })
159162
classpath(pluginJarFile)
160163
mainClass.set(CALL_SITE_INSTRUMENTER_MAIN_CLASS)
@@ -168,8 +171,8 @@ abstract class CallSiteInstrumentationPlugin : Plugin<Project>{
168171
csiExtension.additionalPaths
169172
)
170173

171-
if (project.logger.isInfoEnabled) {
172-
project.logger.info(
174+
if (logger.isInfoEnabled) {
175+
logger.info(
173176
"Aggregated CSI classpath:\n{}",
174177
callsitesClassPath.toSet().sorted().joinToString("\n") { it.toString() }
175178
)

0 commit comments

Comments
 (0)