From 906ec6ecbdf1e4099d2fd23330f531856aa78f56 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:56:12 +0000 Subject: [PATCH 1/3] Update junit5 monorepo to v5.11.3 --- ...yandens.javaagent.example.java-common-conventions.gradle.kts | 2 +- otel/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..ba97ba3 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") From 80b3823defae4e3ab7c0be225dfa0f4822ee0156 Mon Sep 17 00:00:00 2001 From: Ryan Dens Date: Mon, 21 Oct 2024 13:03:30 -0400 Subject: [PATCH 2/3] :bug: correct number of instrumenters --- .../javaagent/otel/OTelJavaagentPluginFunctionalTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]", From f6d58d884345697f1395075ed3b2c29d6de7ea1e Mon Sep 17 00:00:00 2001 From: Ryan Dens Date: Mon, 21 Oct 2024 13:04:01 -0400 Subject: [PATCH 3/3] :bug: fix build cache issue where example project changing didnt force otel functional tests to rerun --- otel/build.gradle.kts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/otel/build.gradle.kts b/otel/build.gradle.kts index ba97ba3..32ff36a 100644 --- a/otel/build.gradle.kts +++ b/otel/build.gradle.kts @@ -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/")) }