Skip to content

Commit 264785e

Browse files
committed
Fix latest dep tests
1 parent 8a3a07f commit 264785e

File tree

5 files changed

+22
-3
lines changed

5 files changed

+22
-3
lines changed

instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ dependencies {
1212
testImplementation(project(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-common:testing"))
1313

1414
testLibrary("org.springframework.cloud:spring-cloud-starter-gateway:2.2.0.RELEASE")
15-
testLibrary("org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE")
15+
// latest version of spring-cloud-starter-gateway is not compatible with spring boot 3.5 yet
16+
testImplementation("org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE")
17+
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:2.4.+") // documented limitation
1618
}
1719

1820
tasks.withType<Test>().configureEach {

smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ dependencies {
2222

2323
implementation(project(":smoke-tests-otel-starter:spring-boot-common"))
2424
testImplementation("org.springframework.boot:spring-boot-starter-test")
25+
26+
val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
27+
if (testLatestDeps) {
28+
// with spring boot 3.5.0 versions of org.mongodb:mongodb-driver-sync and org.mongodb:mongodb-driver-core
29+
// are not in sync
30+
testImplementation("org.mongodb:mongodb-driver-sync:latest.release")
31+
}
2532
}
2633

2734
springBoot {

smoke-tests-otel-starter/spring-boot-3/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ dependencies {
2525
testImplementation("org.testcontainers:kafka")
2626
testImplementation("org.testcontainers:mongodb")
2727
testImplementation("org.springframework.boot:spring-boot-starter-test")
28+
29+
val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
30+
if (testLatestDeps) {
31+
// with spring boot 3.5.0 versions of org.mongodb:mongodb-driver-sync and org.mongodb:mongodb-driver-core
32+
// are not in sync
33+
testImplementation("org.mongodb:mongodb-driver-sync:latest.release")
34+
}
2835
}
2936

3037
springBoot {

smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class AbstractJvmMongodbSpringStarterSmokeTest
2929

3030
@BeforeAll
3131
static void setUpContainer() {
32-
container = new MongoDBContainer("mongo:4.0");
32+
container = new MongoDBContainer("mongo:4.2");
3333
container.start();
3434
}
3535

smoke-tests-otel-starter/spring-smoke-testing/src/main/java/io/opentelemetry/spring/smoketest/AbstractSpringStarterSmokeTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ public abstract class AbstractSpringStarterSmokeTest {
2727
Arrays.asList(
2828
"Unable to load io.netty.resolver.dns.macos.MacOSDnsServerAddressStreamProvider",
2929
"The architecture 'amd64' for image",
30-
"The DescribeTopicPartitions API is not supported, using Metadata API to describe topics");
30+
"The DescribeTopicPartitions API is not supported, using Metadata API to describe topics",
31+
// triggered by
32+
// 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
33+
"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");
3134

3235
@Autowired protected OpenTelemetry openTelemetry;
3336

0 commit comments

Comments
 (0)