From 669bea801bce82a0c1c318c9a11ed21804186fdb Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 30 Sep 2025 14:48:11 -0700 Subject: [PATCH 1/3] Add explicit toolchain version to all modules --- declarative-configuration/build.gradle.kts | 6 ++++++ doc-snippets/api/build.gradle.kts | 6 ++++++ doc-snippets/configuration/build.gradle.kts | 6 ++++++ doc-snippets/exporters/build.gradle.kts | 6 ++++++ doc-snippets/getting-started/build.gradle.kts | 6 ++++++ doc-snippets/spring-starter/build.gradle.kts | 6 ++++++ micrometer-shim/build.gradle.kts | 6 ++++++ spring-native/build.gradle.kts | 6 ++++++ telemetry-testing/build.gradle.kts | 6 ++++++ 9 files changed, 54 insertions(+) diff --git a/declarative-configuration/build.gradle.kts b/declarative-configuration/build.gradle.kts index 45bdb638d2..f257337545 100644 --- a/declarative-configuration/build.gradle.kts +++ b/declarative-configuration/build.gradle.kts @@ -6,6 +6,12 @@ plugins { description = "OpenTelemetry Example for Declarative Configuration" val moduleName by extra { "io.opentelemetry.examples.fileconfig" } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + dependencies { implementation("io.opentelemetry:opentelemetry-api") implementation("io.opentelemetry:opentelemetry-sdk") diff --git a/doc-snippets/api/build.gradle.kts b/doc-snippets/api/build.gradle.kts index ba161182e0..9a69387a7c 100644 --- a/doc-snippets/api/build.gradle.kts +++ b/doc-snippets/api/build.gradle.kts @@ -4,6 +4,12 @@ plugins { val moduleName by extra { "io.opentelemetry.examples.docs.configuration" } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + dependencies { implementation("io.opentelemetry:opentelemetry-api") diff --git a/doc-snippets/configuration/build.gradle.kts b/doc-snippets/configuration/build.gradle.kts index b28ca4aff7..8681bb9772 100644 --- a/doc-snippets/configuration/build.gradle.kts +++ b/doc-snippets/configuration/build.gradle.kts @@ -4,6 +4,12 @@ plugins { val moduleName by extra { "io.opentelemetry.examples.docs.configuration" } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + dependencies { implementation("io.opentelemetry:opentelemetry-sdk") implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") diff --git a/doc-snippets/exporters/build.gradle.kts b/doc-snippets/exporters/build.gradle.kts index cbc35ce710..7836b3dea3 100644 --- a/doc-snippets/exporters/build.gradle.kts +++ b/doc-snippets/exporters/build.gradle.kts @@ -7,6 +7,12 @@ plugins { val moduleName by extra { "io.opentelemetry.examples.docs.exporters" } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.1")) diff --git a/doc-snippets/getting-started/build.gradle.kts b/doc-snippets/getting-started/build.gradle.kts index 05c240d747..656fd77590 100644 --- a/doc-snippets/getting-started/build.gradle.kts +++ b/doc-snippets/getting-started/build.gradle.kts @@ -7,6 +7,12 @@ plugins { val moduleName by extra { "io.opentelemetry.examples.docs.getting-started" } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.1")) diff --git a/doc-snippets/spring-starter/build.gradle.kts b/doc-snippets/spring-starter/build.gradle.kts index 9f1c3a13c9..6a9015ca2f 100644 --- a/doc-snippets/spring-starter/build.gradle.kts +++ b/doc-snippets/spring-starter/build.gradle.kts @@ -7,6 +7,12 @@ plugins { val moduleName by extra { "io.opentelemetry.examples.docs.spring-starter" } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.20.1")) diff --git a/micrometer-shim/build.gradle.kts b/micrometer-shim/build.gradle.kts index d444ebf842..cf8af62b4b 100644 --- a/micrometer-shim/build.gradle.kts +++ b/micrometer-shim/build.gradle.kts @@ -7,6 +7,12 @@ plugins { } description = "OpenTelemetry Example for Micrometer Shim" + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} val moduleName by extra { "io.opentelemetry.examples.micrometer-shim" } val bootRun = tasks.named("bootRun") { diff --git a/spring-native/build.gradle.kts b/spring-native/build.gradle.kts index 337742cd34..56e621417b 100644 --- a/spring-native/build.gradle.kts +++ b/spring-native/build.gradle.kts @@ -7,6 +7,12 @@ plugins { } description = "OpenTelemetry Example for Spring native images" + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} val moduleName by extra { "io.opentelemetry.examples.native" } dependencies { diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index 2326766da3..dc3ca79846 100644 --- a/telemetry-testing/build.gradle.kts +++ b/telemetry-testing/build.gradle.kts @@ -10,6 +10,12 @@ plugins { description = "OpenTelemetry Example for Telemetry Testing" val moduleName by extra { "io.opentelemetry.examples.telemetry-testing" } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + val bootRun = tasks.named("bootRun") { mainClass = "io.opentelemetry.example.javagent.Application" } From d3334abeedd4e5ce48c4a26b3a01202e8f93bc53 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 30 Sep 2025 14:55:17 -0700 Subject: [PATCH 2/3] 11 --- doc-snippets/configuration/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc-snippets/configuration/build.gradle.kts b/doc-snippets/configuration/build.gradle.kts index 8681bb9772..433ceb6283 100644 --- a/doc-snippets/configuration/build.gradle.kts +++ b/doc-snippets/configuration/build.gradle.kts @@ -6,7 +6,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.configuration" } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } From 7ad756afebde169ed6717658590f0bd3ec630b6b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 7 Oct 2025 17:22:29 -0700 Subject: [PATCH 3/3] Update doc-snippets/api/build.gradle.kts Co-authored-by: Lauri Tulmin --- doc-snippets/api/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc-snippets/api/build.gradle.kts b/doc-snippets/api/build.gradle.kts index 9a69387a7c..9f3f7d67d9 100644 --- a/doc-snippets/api/build.gradle.kts +++ b/doc-snippets/api/build.gradle.kts @@ -6,7 +6,7 @@ val moduleName by extra { "io.opentelemetry.examples.docs.configuration" } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } }