diff --git a/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts new file mode 100644 index 0000000000..ffbaeed1cd --- /dev/null +++ b/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts @@ -0,0 +1,19 @@ +plugins { + jacoco +} + +jacoco { + toolVersion = "0.8.6" +} + +tasks { + named("jacocoTestReport") { + dependsOn("test") + + reports { + xml.isEnabled = true + csv.isEnabled = false + html.destination = file("${buildDir}/reports/jacoco/") + } + } +} diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 767bb57fba..19ec7ea1f9 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -27,17 +27,6 @@ afterEvaluate { // Version to use to compile code and run tests. val DEFAULT_JAVA_VERSION = JavaVersion.VERSION_11 -val applyCodeCoverage = !project.path.run { - startsWith(":smoke-tests") || - startsWith(":benchmark") || - startsWith(":instrumentation") || - startsWith(":testing-common") -} - -if (applyCodeCoverage) { - apply(from = "${rootDir}/gradle/jacoco.gradle") -} - java { toolchain { languageVersion.set(otelJava.minJavaVersionSupported.map { JavaLanguageVersion.of(Math.max(it.majorVersion.toInt(), DEFAULT_JAVA_VERSION.majorVersion.toInt())) }) diff --git a/buildSrc/src/main/kotlin/otel.library-instrumentation.gradle.kts b/buildSrc/src/main/kotlin/otel.library-instrumentation.gradle.kts index ffcd051f87..f216701cda 100644 --- a/buildSrc/src/main/kotlin/otel.library-instrumentation.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.library-instrumentation.gradle.kts @@ -1,5 +1,6 @@ plugins { id("otel.java-conventions") + id("otel.jacoco-conventions") id("otel.publish-conventions") id("otel.instrumentation-conventions") } diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle deleted file mode 100644 index 4b862c947f..0000000000 --- a/gradle/jacoco.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: "jacoco" - -jacoco { - toolVersion = "0.8.6" -} - -tasks.named('jacocoTestReport').configure { - dependsOn('test') - reports { - xml.enabled true - csv.enabled false - html.destination file("${buildDir}/reports/jacoco/") - } -} diff --git a/instrumentation-api/instrumentation-api.gradle b/instrumentation-api/instrumentation-api.gradle index 28bdd31489..bd536af1ae 100644 --- a/instrumentation-api/instrumentation-api.gradle +++ b/instrumentation-api/instrumentation-api.gradle @@ -5,6 +5,7 @@ plugins { group = 'io.opentelemetry.instrumentation' apply plugin: "otel.java-conventions" +apply plugin: "otel.jacoco-conventions" apply plugin: "otel.publish-conventions" def jflexTargetDir = file"${project.buildDir}/generated/jflex/sql" diff --git a/javaagent-api/javaagent-api.gradle b/javaagent-api/javaagent-api.gradle index ebdfc8a5d2..73e6aeb055 100644 --- a/javaagent-api/javaagent-api.gradle +++ b/javaagent-api/javaagent-api.gradle @@ -1,6 +1,7 @@ group = 'io.opentelemetry.javaagent' apply plugin: "otel.java-conventions" +apply plugin: "otel.jacoco-conventions" apply plugin: "otel.publish-conventions" dependencies {