Merge branch 'main' into feat/add-jvm-file-descriptors-to-runtime-instrumentation

laurit · laurit · commit 5f22abd2200f · 2025-05-23T16:59:13.000+03:00
diff --git a/benchmark-overhead-jmh/build.gradle.kts b/benchmark-overhead-jmh/build.gradle.kts
@@ -13,7 +13,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.6")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.0")
 }
 
 tasks {
diff --git a/benchmark-overhead/gradle/wrapper/gradle-wrapper.properties b/benchmark-overhead/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/distro/gradle/wrapper/gradle-wrapper.properties b/examples/distro/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/extension/gradle/wrapper/gradle-wrapper.properties b/examples/extension/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle-plugins/gradle/wrapper/gradle-wrapper.properties b/gradle-plugins/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
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
@@ -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 {
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
@@ -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
@@ -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
@@ -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
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ otelJava {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.6")`
	`16`	`+ jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.0")`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ dependencies {`
`12`	`12`	`testImplementation(project(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-common:testing"))`
`13`	`13`
`14`	`14`	`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`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`tasks.withType<Test>().configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class AbstractJvmMongodbSpringStarterSmokeTest`
`29`	`29`
`30`	`30`	`@BeforeAll`
`31`	`31`	`static void setUpContainer() {`
`32`		`- container = new MongoDBContainer("mongo:4.0");`
	`32`	`+ container = new MongoDBContainer("mongo:4.2");`
`33`	`33`	`container.start();`
`34`	`34`	`}`
`35`	`35`