Merge branch 'main' into large-sql

Author: laurit

benchmark-overhead-jmh/build.gradle.kts

@@ -13,7 +13,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.2")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.3")
 }
 
 tasks {

benchmark-overhead/build.gradle.kts

@@ -18,8 +18,8 @@ repositories {
 dependencies {
   implementation(enforcedPlatform("org.junit:junit-bom:5.11.4"))
 
-  testImplementation("org.testcontainers:testcontainers:1.20.4")
-  testImplementation("org.testcontainers:postgresql:1.20.4")
+  testImplementation("org.testcontainers:testcontainers:1.20.5")
+  testImplementation("org.testcontainers:postgresql:1.20.5")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -439,7 +439,6 @@ dependencyCheck {
   suppressionFile = "buildscripts/dependency-check-suppressions.xml"
   failBuildOnCVSS = 7.0f // fail on high or critical CVE
   nvd.apiKey = System.getenv("NVD_API_KEY")
-  nvd.delay = 3500 // until next dependency check release (https://github.com/jeremylong/DependencyCheck/pull/6333)
 }
 
 idea {

dependencyManagement/build.gradle.kts

@@ -33,7 +33,7 @@ val DEPENDENCY_BOMS = listOf(
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
   "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
-  "org.testcontainers:testcontainers-bom:1.20.4"
+  "org.testcontainers:testcontainers-bom:1.20.5"
 )
 
 val autoServiceVersion = "1.1.1"
@@ -44,7 +44,7 @@ val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"
 val slf4jVersion = "2.0.16"
-val semConvVersion = "1.30.0-rc.1"
+val semConvVersion = "1.30.0"
 val semConvAlphaVersion =  semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")
 
 val CORE_DEPENDENCIES = listOf(

examples/distro/smoke-tests/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  testImplementation("org.testcontainers:testcontainers:1.20.4")
+  testImplementation("org.testcontainers:testcontainers:1.20.5")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
   testImplementation("com.google.protobuf:protobuf-java-util:4.29.3")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

examples/extension/build.gradle

@@ -99,7 +99,7 @@ dependencies {
   implementation 'org.apache.commons:commons-lang3:3.17.0'
 
   //All dependencies below are only for tests
-  testImplementation("org.testcontainers:testcontainers:1.20.4")
+  testImplementation("org.testcontainers:testcontainers:1.20.5")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
   testImplementation("com.google.protobuf:protobuf-java-util:4.29.3")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFile.java

@@ -39,6 +39,11 @@ static Map<String, String> getProperties() {
     return configFileContents;
   }
 
+  // visible for tests
+  static void resetForTest() {
+    configFileContents = null;
+  }
+
   // visible for tests
   static Map<String, String> loadConfigFile() {
     // Reading from system property first and from env after

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java

@@ -106,6 +106,8 @@ public void configure(IgnoredTypesBuilder builder) {
         .allowClass("org.springframework.boot.web.servlet.")
         .allowClass("org.springframework.boot.web.embedded.netty.GracefulShutdown$$Lambda")
         .allowClass("org.springframework.boot.web.embedded.tomcat.GracefulShutdown$$Lambda")
+        .allowClass(
+            "org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory$$Lambda")
         .allowClass(
             "org.springframework.boot.actuate.metrics.web.reactive.server.MetricsWebFilter$$Lambda")
         .allowClass("org.springframework.boot.autoconfigure.BackgroundPreinitializer$")

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java

@@ -32,6 +32,7 @@ class ConfigurationPropertiesSupplierTest {
   @AfterAll
   static void cleanUp() {
     GlobalOpenTelemetry.resetForTest();
+    ConfigurationFile.resetForTest();
   }
 
   // regression for https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6696

licenses/licenses.md

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   implementation("com.google.api-client:google-api-client:2.7.2")
-  implementation("com.google.apis:google-api-services-sheets:v4-rev20250106-2.0.0")
+  implementation("com.google.apis:google-api-services-sheets:v4-rev20250211-2.0.0")
   implementation("com.google.auth:google-auth-library-oauth2-http:1.32.1")
 }