open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix latest dep tests (#13913)

This commit is contained in:
Lauri Tulmin 2025-05-23 16:34:47 +03:00 committed by GitHub
parent 8a3a07f1f9
commit df42601130
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {

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

@ -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 {

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

@ -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 {

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

@ -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();
}

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

@ -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;