Skip to content

Fix latest dep tests #13913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2025
Merged

Fix latest dep tests #13913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...rumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Test>().configureEach {
Expand Down
7 changes: 7 additions & 0 deletions smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 7 additions & 0 deletions smoke-tests-otel-starter/spring-boot-3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class AbstractJvmMongodbSpringStarterSmokeTest

@BeforeAll
static void setUpContainer() {
container = new MongoDBContainer("mongo:4.0");
container = new MongoDBContainer("mongo:4.2");
Copy link
Contributor

@SylvainJuge SylvainJuge May 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does updating the mongodb driver version here is required for this temporary work-around or is it just because you've tried first to update it to a newer version to see if that helped to fix the issue ? This might be something to keep and not revert when we remove this temporary work-around in the future.

Copy link
Contributor Author

@laurit laurit May 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is required, latest dep tests update the java driver and it refuses to speak with versions earlier than 4.2

container.start();
}

Expand Down
5 changes: 4 additions & 1 deletion ...sting/src/main/java/io/opentelemetry/spring/smoketest/AbstractSpringStarterSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading