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/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..25e54d70ec 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" @@ -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") } diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index 07268e01f0..8146ed28ca 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" @@ -32,7 +32,9 @@ 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") 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..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 @@ -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,9 @@ 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.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; 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;