Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@

package io.opentelemetry.gradle

import org.gradle.api.JavaVersion
import org.gradle.api.provider.Property

abstract class OtelJavaExtension {
abstract val moduleName: Property<String>

abstract val minJavaVersionSupported: Property<JavaVersion>

init {
minJavaVersionSupported.convention(JavaVersion.VERSION_1_8)
}
}
24 changes: 15 additions & 9 deletions buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import io.opentelemetry.gradle.OtelJavaExtension
import org.gradle.api.JavaVersion
import org.gradle.api.tasks.testing.logging.TestExceptionFormat

plugins {
Expand Down Expand Up @@ -74,7 +75,7 @@ val testJavaVersion = gradle.startParameter.projectProperties.get("testJavaVersi
tasks {
withType<JavaCompile>().configureEach {
with(options) {
release.set(8)
release.set(otelJava.minJavaVersionSupported.map { it.majorVersion.toInt() })

if (name != "jmhCompileGeneratedClasses") {
compilerArgs.addAll(
Expand Down Expand Up @@ -108,14 +109,6 @@ tasks {
withType<Test>().configureEach {
useJUnitPlatform()

if (testJavaVersion != null) {
javaLauncher.set(
javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(testJavaVersion.majorVersion))
},
)
}

val defaultMaxRetries = if (System.getenv().containsKey("CI")) 2 else 0
val maxTestRetries = gradle.startParameter.projectProperties["maxTestRetries"]?.toInt() ?: defaultMaxRetries

Expand Down Expand Up @@ -174,6 +167,19 @@ tasks {
}
}

afterEvaluate {
tasks.withType<Test>().configureEach {
if (testJavaVersion != null) {
javaLauncher.set(
javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(testJavaVersion.majorVersion))
}
)
isEnabled = isEnabled && testJavaVersion >= otelJava.minJavaVersionSupported.get()
}
}
}

// Add version information to published artifacts.
plugins.withId("otel.publish-conventions") {
tasks {
Expand Down
16 changes: 3 additions & 13 deletions exporters/sender/jdk/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
import org.gradle.api.JavaVersion

plugins {
id("otel.java-conventions")
id("otel.publish-conventions")
}

description = "OpenTelemetry JDK HttpSender"
otelJava.moduleName.set("io.opentelemetry.exporter.sender.jdk.internal")
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11)

dependencies {
implementation(project(":exporters:common"))
implementation(project(":sdk:common"))

testImplementation("com.fasterxml.jackson.core:jackson-core")
}

tasks {
withType<JavaCompile>().configureEach {
sourceCompatibility = "11"
targetCompatibility = "11"
options.release.set(11)
}
}

tasks.test {
val testJavaVersion: String? by project
enabled = !testJavaVersion.equals("8")
}
14 changes: 3 additions & 11 deletions integration-tests/graal-incubating/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import org.gradle.api.JavaVersion

plugins {
id("otel.java-conventions")
id("org.graalvm.buildtools.native")
}

description = "OpenTelemetry Graal Integration Tests (Incubating)"
otelJava.moduleName.set("io.opentelemetry.graal.integration.tests.incubating")
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11)

sourceSets {
main {
Expand All @@ -25,17 +28,6 @@ dependencies {

// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
tasks {
withType<JavaCompile>().configureEach {
sourceCompatibility = "11"
targetCompatibility = "11"
options.release.set(11)
}
withType<Test>().configureEach {
val testJavaVersion: String? by project
enabled = !testJavaVersion.equals("8")
}
}

graalvmNative {
binaries {
Expand Down
14 changes: 3 additions & 11 deletions integration-tests/graal/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import org.gradle.api.JavaVersion

plugins {
id("otel.java-conventions")
id("org.graalvm.buildtools.native")
}

description = "OpenTelemetry Graal Integration Tests"
otelJava.moduleName.set("io.opentelemetry.graal.integration.tests")
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11)

sourceSets {
main {
Expand All @@ -23,17 +26,6 @@ dependencies {

// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
tasks {
withType<JavaCompile>().configureEach {
sourceCompatibility = "11"
targetCompatibility = "11"
options.release.set(11)
}
withType<Test>().configureEach {
val testJavaVersion: String? by project
enabled = !testJavaVersion.equals("8")
}
}

graalvmNative {
binaries {
Expand Down
17 changes: 3 additions & 14 deletions javadoc-crawler/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.gradle.api.JavaVersion

plugins {
id("otel.java-conventions")
}
Expand All @@ -9,22 +11,9 @@ dependencies {

description = "OpenTelemetry Javadoc Crawler"
otelJava.moduleName.set("io.opentelemetry.javadocs")
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17)

tasks {
withType<JavaCompile>().configureEach {
sourceCompatibility = "17"
targetCompatibility = "17"
options.release.set(17)
}

// only test on java 17+
val testJavaVersion: String? by project
if (testJavaVersion != null && Integer.valueOf(testJavaVersion) < 17) {
test {
enabled = false
}
}

val crawl by registering(JavaExec::class) {
dependsOn(classes)

Expand Down
Loading