From 264785e12e4f65eba6d29584c2def9b2e2d1a2eb Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 23 May 2025 15:51:01 +0300 Subject: [PATCH] Fix latest dep tests --- .../spring-cloud-gateway-2.2/testing/build.gradle.kts | 4 +++- smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts | 7 +++++++ smoke-tests-otel-starter/spring-boot-3/build.gradle.kts | 7 +++++++ .../AbstractJvmMongodbSpringStarterSmokeTest.java | 2 +- .../spring/smoketest/AbstractSpringStarterSmokeTest.java | 5 ++++- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts index bf0a90a3cdbd..aee5bd929580 100644 --- a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts +++ b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts @@ -12,7 +12,9 @@ dependencies { testImplementation(project(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-common:testing")) testLibrary("org.springframework.cloud:spring-cloud-starter-gateway:2.2.0.RELEASE") - testLibrary("org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE") + // latest version of spring-cloud-starter-gateway is not compatible with spring boot 3.5 yet + testImplementation("org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE") + latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:2.4.+") // documented limitation } tasks.withType().configureEach { diff --git a/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts index c8395717260f..0f1ccf155b0a 100644 --- a/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts @@ -22,6 +22,13 @@ dependencies { implementation(project(":smoke-tests-otel-starter:spring-boot-common")) testImplementation("org.springframework.boot:spring-boot-starter-test") + + val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true" + if (testLatestDeps) { + // with spring boot 3.5.0 versions of org.mongodb:mongodb-driver-sync and org.mongodb:mongodb-driver-core + // are not in sync + testImplementation("org.mongodb:mongodb-driver-sync:latest.release") + } } springBoot { diff --git a/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts index e04442dd47f8..1b7b865e7b7d 100644 --- a/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts @@ -25,6 +25,13 @@ dependencies { testImplementation("org.testcontainers:kafka") testImplementation("org.testcontainers:mongodb") testImplementation("org.springframework.boot:spring-boot-starter-test") + + val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true" + if (testLatestDeps) { + // with spring boot 3.5.0 versions of org.mongodb:mongodb-driver-sync and org.mongodb:mongodb-driver-core + // are not in sync + testImplementation("org.mongodb:mongodb-driver-sync:latest.release") + } } springBoot { diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java index 5915f8fca138..0c83201e4bfb 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java @@ -29,7 +29,7 @@ public class AbstractJvmMongodbSpringStarterSmokeTest @BeforeAll static void setUpContainer() { - container = new MongoDBContainer("mongo:4.0"); + container = new MongoDBContainer("mongo:4.2"); container.start(); } diff --git a/smoke-tests-otel-starter/spring-smoke-testing/src/main/java/io/opentelemetry/spring/smoketest/AbstractSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-smoke-testing/src/main/java/io/opentelemetry/spring/smoketest/AbstractSpringStarterSmokeTest.java index 4848fc5dd4fb..3b93d9dad437 100644 --- a/smoke-tests-otel-starter/spring-smoke-testing/src/main/java/io/opentelemetry/spring/smoketest/AbstractSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-smoke-testing/src/main/java/io/opentelemetry/spring/smoketest/AbstractSpringStarterSmokeTest.java @@ -27,7 +27,10 @@ public abstract class AbstractSpringStarterSmokeTest { Arrays.asList( "Unable to load io.netty.resolver.dns.macos.MacOSDnsServerAddressStreamProvider", "The architecture 'amd64' for image", - "The DescribeTopicPartitions API is not supported, using Metadata API to describe topics"); + "The DescribeTopicPartitions API is not supported, using Metadata API to describe topics", + // triggered by + // https://github.com/spring-projects/spring-data-mongodb/blob/9a40b7e701871affb88c691b8ac8c044155e421b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java#L473 + "Registering converter from interface java.util.List to interface org.springframework.data.domain.Vector as reading converter although it doesn't convert from a store-supported type; You might want to check your annotation setup at the converter implementation"); @Autowired protected OpenTelemetry openTelemetry;