diff --git a/example-projects/buildSrc/src/main/kotlin/com.ryandens.javaagent.example.java-common-conventions.gradle.kts b/example-projects/buildSrc/src/main/kotlin/com.ryandens.javaagent.example.java-common-conventions.gradle.kts index f48274b..9337a64 100644 --- a/example-projects/buildSrc/src/main/kotlin/com.ryandens.javaagent.example.java-common-conventions.gradle.kts +++ b/example-projects/buildSrc/src/main/kotlin/com.ryandens.javaagent.example.java-common-conventions.gradle.kts @@ -10,7 +10,7 @@ dependencies { constraints { // Define dependency versions as constraints } - testImplementation("org.junit.jupiter:junit-jupiter:5.11.2") + testImplementation("org.junit.jupiter:junit-jupiter:5.11.3") } tasks.named("test") { diff --git a/otel/build.gradle.kts b/otel/build.gradle.kts index 99128c6..32ff36a 100644 --- a/otel/build.gradle.kts +++ b/otel/build.gradle.kts @@ -4,7 +4,7 @@ plugins { dependencies { implementation(project(":plugin")) - testImplementation(platform("org.junit:junit-bom:5.11.2")) + testImplementation(platform("org.junit:junit-bom:5.11.3")) testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.platform:junit-platform-launcher") @@ -25,6 +25,16 @@ gradlePlugin { } } -tasks.named("functionalTest") { +tasks.functionalTest { useJUnitPlatform() + inputs.file(layout.projectDirectory.file("../example-projects/buildSrc/build.gradle.kts")) + inputs.files(layout.projectDirectory.dir("../example-projects/buildSrc/src/")) + + inputs.file(layout.projectDirectory.file("../example-projects/app/build.gradle.kts")) + inputs.files(layout.projectDirectory.dir("../example-projects/app/src/")) + + inputs.file(layout.projectDirectory.file("../example-projects/custom-instrumentation/build.gradle.kts")) + inputs.files(layout.projectDirectory.dir("../example-projects/custom-instrumentation/src/")) + + inputs.files(layout.projectDirectory.dir("../example-projects/gradle/")) } diff --git a/otel/src/functionalTest/kotlin/com/ryandens/javaagent/otel/OTelJavaagentPluginFunctionalTest.kt b/otel/src/functionalTest/kotlin/com/ryandens/javaagent/otel/OTelJavaagentPluginFunctionalTest.kt index 48000ee..7cd19bd 100644 --- a/otel/src/functionalTest/kotlin/com/ryandens/javaagent/otel/OTelJavaagentPluginFunctionalTest.kt +++ b/otel/src/functionalTest/kotlin/com/ryandens/javaagent/otel/OTelJavaagentPluginFunctionalTest.kt @@ -25,7 +25,7 @@ class OTelJavaagentPluginFunctionalTest { // Verify the result // TODO use testcontainers to start an otel fake backend and retrieve spans from it here to verify instrumentation worked assertTrue(result.output.contains("AgentInstaller - Installed 1 extension(s)")) - assertTrue(result.output.contains("InstrumentationLoader - Installed 254 instrumenter(s)")) + assertTrue(result.output.contains("InstrumentationLoader - Installed 257 instrumenter(s)")) assertTrue( result.output.contains( "Applying instrumentation: sample [class com.ryandens.example.SampleInstrumentationModule]",