From 5be38b33268097104f28a71a5f4fe4cc0c0f989f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:23:23 +0000 Subject: [PATCH 1/5] chore(deps): update plugin org.springframework.boot to v3 --- javaagent/build.gradle.kts | 2 +- micrometer-shim/build.gradle.kts | 2 +- telemetry-testing/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index 9252c7200..5075be11b 100644 --- a/javaagent/build.gradle.kts +++ b/javaagent/build.gradle.kts @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("java") - id("org.springframework.boot") version "2.7.18" + id("org.springframework.boot") version "3.3.5" } description = "OpenTelemetry Example for Java Agent" diff --git a/micrometer-shim/build.gradle.kts b/micrometer-shim/build.gradle.kts index fae70dcd8..1aeb7ce5a 100644 --- a/micrometer-shim/build.gradle.kts +++ b/micrometer-shim/build.gradle.kts @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun plugins { id("java") - id("org.springframework.boot") version "2.7.18" + id("org.springframework.boot") version "3.3.5" } description = "OpenTelemetry Example for Micrometer Shim" diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index 3f6410734..fbdaba017 100644 --- a/telemetry-testing/build.gradle.kts +++ b/telemetry-testing/build.gradle.kts @@ -4,7 +4,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun plugins { id("java") - id("org.springframework.boot") version "2.7.18" + id("org.springframework.boot") version "3.3.5" } description = "OpenTelemetry Example for Telemetry Testing" From bcb0c0d0ea4593958876a80905dd59e98857a483 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 4 Nov 2024 19:48:07 -0800 Subject: [PATCH 2/5] update --- .github/renovate.json5 | 6 ------ javaagent/build.gradle.kts | 6 ------ micrometer-shim/build.gradle.kts | 6 ------ telemetry-testing/build.gradle.kts | 6 ------ 4 files changed, 24 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 1de574d7a..532a8b3a8 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -28,12 +28,6 @@ "matchPackagePrefixes": ["com.google.protobuf"], "groupName": "protobuf packages" }, - { - // intentionally using Spring Boot 2 in some examples - "matchPackageNames": ["org.springframework.boot"], - "matchUpdateTypes": ["major"], - "enabled": false - }, { // intentionally using Java 11 in some examples // not using matchUpdateTypes "major", because renovate wants to bump "11-jre" to "11.0.19_7-jre" diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index 5075be11b..f7ca3082d 100644 --- a/javaagent/build.gradle.kts +++ b/javaagent/build.gradle.kts @@ -9,12 +9,6 @@ plugins { description = "OpenTelemetry Example for Java Agent" val moduleName by extra { "io.opentelemetry.examples.javagent" } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) - } -} - val agent = configurations.create("agent") val extension = configurations.create("extension") diff --git a/micrometer-shim/build.gradle.kts b/micrometer-shim/build.gradle.kts index 1aeb7ce5a..30bf27ba5 100644 --- a/micrometer-shim/build.gradle.kts +++ b/micrometer-shim/build.gradle.kts @@ -9,12 +9,6 @@ plugins { description = "OpenTelemetry Example for Micrometer Shim" val moduleName by extra { "io.opentelemetry.examples.micrometer-shim" } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) - } -} - val bootRun = tasks.named("bootRun") { mainClass = "io.opentelemetry.example.micrometer.Application" } diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index fbdaba017..bf8f7ce2b 100644 --- a/telemetry-testing/build.gradle.kts +++ b/telemetry-testing/build.gradle.kts @@ -10,12 +10,6 @@ plugins { description = "OpenTelemetry Example for Telemetry Testing" val moduleName by extra { "io.opentelemetry.examples.telemetry-testing" } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) - } -} - val bootRun = tasks.named("bootRun") { mainClass = "io.opentelemetry.example.javagent.Application" } From 1148e945c6a7d8a35938d3acdcf1a5364b075789 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 4 Nov 2024 19:51:14 -0800 Subject: [PATCH 3/5] fix --- .../io/opentelemetry/example/telemetry/ApplicationTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java b/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java index 15195f867..b8531e4e5 100644 --- a/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java +++ b/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; /** * The role of this class is to test the telemetry. It only works if the opentelemetry java agent is @@ -40,7 +40,8 @@ webEnvironment = RANDOM_PORT) class ApplicationTest { - @LocalServerPort private int port; + @LocalServerPort + private int port; @Autowired TestRestTemplate template; From 90771c30cafd4e709cf7540d6765fe6574e4b26b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 4 Nov 2024 19:59:19 -0800 Subject: [PATCH 4/5] spotless --- .../io/opentelemetry/example/telemetry/ApplicationTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java b/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java index b8531e4e5..75c501877 100644 --- a/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java +++ b/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java @@ -40,8 +40,7 @@ webEnvironment = RANDOM_PORT) class ApplicationTest { - @LocalServerPort - private int port; + @LocalServerPort private int port; @Autowired TestRestTemplate template; From 38f6508a5d44540d128bac154c46c12fb3533642 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 4 Nov 2024 20:04:24 -0800 Subject: [PATCH 5/5] fix --- telemetry-testing/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index bf8f7ce2b..5dff207df 100644 --- a/telemetry-testing/build.gradle.kts +++ b/telemetry-testing/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.3")) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-engine") - testImplementation("org.mock-server:mockserver-netty:5.15.0:shaded") + testImplementation("org.mock-server:mockserver-netty:5.15.0") testImplementation("org.awaitility:awaitility:4.2.2") testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha") testImplementation("org.assertj:assertj-core:3.26.3")