From f10d6c5b4050c98abef2310bb455b971b57feb4e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Nov 2025 20:26:18 +0000 Subject: [PATCH 1/7] chore(deps): update plugin org.springframework.boot to v4 --- doc-snippets/exporters/build.gradle.kts | 2 +- doc-snippets/getting-started/build.gradle.kts | 2 +- doc-snippets/spring-starter/build.gradle.kts | 2 +- javaagent-declarative-configuration/build.gradle.kts | 2 +- javaagent/build.gradle.kts | 2 +- logging-k8s-stdout-otlp-json/build.gradle.kts | 2 +- micrometer-shim/build.gradle.kts | 2 +- spring-native/build.gradle.kts | 2 +- telemetry-testing/build.gradle.kts | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc-snippets/exporters/build.gradle.kts b/doc-snippets/exporters/build.gradle.kts index a1560039bf..0bfc7d25ba 100644 --- a/doc-snippets/exporters/build.gradle.kts +++ b/doc-snippets/exporters/build.gradle.kts @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin plugins { id("java") - id("org.springframework.boot") version "3.5.7" + id("org.springframework.boot") version "4.0.0" } val moduleName by extra { "io.opentelemetry.examples.docs.exporters" } diff --git a/doc-snippets/getting-started/build.gradle.kts b/doc-snippets/getting-started/build.gradle.kts index 6a07b873be..5701236d32 100644 --- a/doc-snippets/getting-started/build.gradle.kts +++ b/doc-snippets/getting-started/build.gradle.kts @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin plugins { id("java") - id("org.springframework.boot") version "3.5.7" + id("org.springframework.boot") version "4.0.0" } val moduleName by extra { "io.opentelemetry.examples.docs.getting-started" } diff --git a/doc-snippets/spring-starter/build.gradle.kts b/doc-snippets/spring-starter/build.gradle.kts index 8152486241..b80b088028 100644 --- a/doc-snippets/spring-starter/build.gradle.kts +++ b/doc-snippets/spring-starter/build.gradle.kts @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin plugins { id("java") - id("org.springframework.boot") version "3.5.7" + id("org.springframework.boot") version "4.0.0" } val moduleName by extra { "io.opentelemetry.examples.docs.spring-starter" } diff --git a/javaagent-declarative-configuration/build.gradle.kts b/javaagent-declarative-configuration/build.gradle.kts index c5ae12a7a5..49b515b7e0 100644 --- a/javaagent-declarative-configuration/build.gradle.kts +++ b/javaagent-declarative-configuration/build.gradle.kts @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("java") - id("org.springframework.boot") version "3.5.7" + id("org.springframework.boot") version "4.0.0" } description = "OpenTelemetry Java Agent Declarative Configuration Example" diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index a4d062e03b..3948eb8d05 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 "3.5.7" + id("org.springframework.boot") version "4.0.0" } description = "OpenTelemetry Example for Java Agent" diff --git a/logging-k8s-stdout-otlp-json/build.gradle.kts b/logging-k8s-stdout-otlp-json/build.gradle.kts index 948db1afe2..3de8f7213f 100644 --- a/logging-k8s-stdout-otlp-json/build.gradle.kts +++ b/logging-k8s-stdout-otlp-json/build.gradle.kts @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("java") - id("org.springframework.boot") version "3.5.7" + id("org.springframework.boot") version "4.0.0" } description = "OpenTelemetry Example for Java Agent with Stdout logging" diff --git a/micrometer-shim/build.gradle.kts b/micrometer-shim/build.gradle.kts index f2b9f683f2..cf4cee14bd 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 "3.5.7" + id("org.springframework.boot") version "4.0.0" } description = "OpenTelemetry Example for Micrometer Shim" diff --git a/spring-native/build.gradle.kts b/spring-native/build.gradle.kts index 467ab5359b..9ef31976ea 100644 --- a/spring-native/build.gradle.kts +++ b/spring-native/build.gradle.kts @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin plugins { id("java") - id("org.springframework.boot") version "3.5.7" + id("org.springframework.boot") version "4.0.0" id("org.graalvm.buildtools.native") version "0.11.3" } diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index 07268e01f0..a11f3e8594 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 "3.5.7" + id("org.springframework.boot") version "4.0.0" } description = "OpenTelemetry Example for Telemetry Testing" From 7fb3f8684d83fe458c1209d6e7f407f6eadb22f7 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 21 Nov 2025 09:54:11 +0100 Subject: [PATCH 2/7] fix --- micrometer-shim/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/micrometer-shim/build.gradle.kts b/micrometer-shim/build.gradle.kts index cf4cee14bd..25e54d70ec 100644 --- a/micrometer-shim/build.gradle.kts +++ b/micrometer-shim/build.gradle.kts @@ -31,5 +31,5 @@ dependencies { //spring modules implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-actuator") - implementation("org.springframework.boot:spring-boot-starter-aop") + implementation("org.springframework.boot:spring-boot-starter-aspectj") } From e6fba248abf7ac3acb84b8802921a4b7a90e0258 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 21 Nov 2025 10:32:44 +0100 Subject: [PATCH 3/7] fix --- telemetry-testing/build.gradle.kts | 1 + .../io/opentelemetry/example/telemetry/ApplicationTest.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index a11f3e8594..66ba37b034 100644 --- a/telemetry-testing/build.gradle.kts +++ b/telemetry-testing/build.gradle.kts @@ -33,6 +33,7 @@ dependencies { //spring modules implementation("org.springframework.boot:spring-boot-starter-web") testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-resttestclient") testImplementation(enforcedPlatform("org.junit:junit-bom:6.0.1")) testImplementation("org.junit.jupiter:junit-jupiter-api") 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 75c501877f..2919408827 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 @@ -7,7 +7,7 @@ import static org.mockserver.model.HttpRequest.request; import static org.mockserver.model.HttpResponse.response; import static org.mockserver.stop.Stop.stopQuietly; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.*; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import com.google.protobuf.InvalidProtocolBufferException; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest; @@ -26,8 +26,8 @@ import org.mockserver.model.Body; import org.mockserver.model.HttpRequest; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.server.LocalServerPort; /** From 339f5995da79a06a56f75bd3522eca962b008dc4 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 21 Nov 2025 10:55:41 +0100 Subject: [PATCH 4/7] exclude starter --- .github/renovate.json5 | 7 +++++++ doc-snippets/spring-starter/build.gradle.kts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index a86f27e6ba..772680ce44 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -50,6 +50,13 @@ "matchUpdateTypes": ["major"], "enabled": false }, + { + // Spring starter doesn't support Spring Boot 4 yet + "matchPackageNames": ["org.springframework.boot"], + "matchFilePatterns": ["doc-snippets/spring-starter/build.gradle.kts"], + "matchUpdateTypes": ["major"], + "enabled": false + }, { // Skip locally built dice image used in logging-k8s-stdout-otlp-json "matchManagers": ["kubernetes"], diff --git a/doc-snippets/spring-starter/build.gradle.kts b/doc-snippets/spring-starter/build.gradle.kts index b80b088028..8152486241 100644 --- a/doc-snippets/spring-starter/build.gradle.kts +++ b/doc-snippets/spring-starter/build.gradle.kts @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin plugins { id("java") - id("org.springframework.boot") version "4.0.0" + id("org.springframework.boot") version "3.5.7" } val moduleName by extra { "io.opentelemetry.examples.docs.spring-starter" } From f8989904610e5c3189a85c97d5e4444c13739470 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 21 Nov 2025 11:22:13 +0100 Subject: [PATCH 5/7] fix --- telemetry-testing/build.gradle.kts | 1 + .../io/opentelemetry/example/telemetry/ApplicationTest.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index 66ba37b034..8146ed28ca 100644 --- a/telemetry-testing/build.gradle.kts +++ b/telemetry-testing/build.gradle.kts @@ -32,6 +32,7 @@ dependencies { implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.22.0") //spring modules implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-restclient") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.boot:spring-boot-resttestclient") 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 2919408827..a3b9fcb8c0 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 @@ -27,6 +27,7 @@ import org.mockserver.model.HttpRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; @@ -38,6 +39,7 @@ @SpringBootTest( classes = {Application.class}, webEnvironment = RANDOM_PORT) +@AutoConfigureTestRestTemplate class ApplicationTest { @LocalServerPort private int port; From 87202b24518ffaf8aedb1b4853334300f7f9d4f2 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 21 Nov 2025 14:37:51 +0100 Subject: [PATCH 6/7] fix --- .github/renovate.json5 | 5 ++++- spring-native/build.gradle.kts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 772680ce44..fc14b1c9d6 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -53,7 +53,10 @@ { // Spring starter doesn't support Spring Boot 4 yet "matchPackageNames": ["org.springframework.boot"], - "matchFilePatterns": ["doc-snippets/spring-starter/build.gradle.kts"], + "matchFilePatterns": [ + "doc-snippets/spring-starter/build.gradle.kts", + "spring-native/build.gradle.kts" + ], "matchUpdateTypes": ["major"], "enabled": false }, diff --git a/spring-native/build.gradle.kts b/spring-native/build.gradle.kts index 9ef31976ea..467ab5359b 100644 --- a/spring-native/build.gradle.kts +++ b/spring-native/build.gradle.kts @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin plugins { id("java") - id("org.springframework.boot") version "4.0.0" + id("org.springframework.boot") version "3.5.7" id("org.graalvm.buildtools.native") version "0.11.3" } From b6c8afae4de023e422a73b992b8eedf5be5c9a4f Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Tue, 25 Nov 2025 18:17:27 +0100 Subject: [PATCH 7/7] fix --- .github/renovate.json5 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index fc14b1c9d6..a86f27e6ba 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -50,16 +50,6 @@ "matchUpdateTypes": ["major"], "enabled": false }, - { - // Spring starter doesn't support Spring Boot 4 yet - "matchPackageNames": ["org.springframework.boot"], - "matchFilePatterns": [ - "doc-snippets/spring-starter/build.gradle.kts", - "spring-native/build.gradle.kts" - ], - "matchUpdateTypes": ["major"], - "enabled": false - }, { // Skip locally built dice image used in logging-k8s-stdout-otlp-json "matchManagers": ["kubernetes"],