Fix latest dep tests (#12774)

open-telemetry · Nov 22, 2024 · 8eef5ca · 8eef5ca
1 parent bfbfe30
commit 8eef5ca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts b/instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 val latestDepTest = findProperty("testLatestDeps") as Boolean
 protobuf {
   protoc {
-    val protocVersion = if (latestDepTest) "4.28.2" else "3.19.2"
+    val protocVersion = if (latestDepTest) "3.25.5" else "3.19.2"
     artifact = "com.google.protobuf:protoc:$protocVersion"
   }
   plugins {

diff --git a/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts b/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts
@@ -18,6 +18,7 @@ muzzle {
   }
 }
 
+val latestDepTest = findProperty("testLatestDeps") as Boolean
 dependencies {
   bootstrap(project(":instrumentation:internal:internal-application-logger:bootstrap"))
 
@@ -30,8 +31,8 @@ dependencies {
     }
   }
 
-  if (findProperty("testLatestDeps") as Boolean) {
-    testImplementation("ch.qos.logback:logback-classic:+")
+  if (latestDepTest) {
+    testImplementation("ch.qos.logback:logback-classic:latest.release")
   } else {
     testImplementation("ch.qos.logback:logback-classic") {
       version {
@@ -47,3 +48,10 @@ dependencies {
 
   testLibrary("org.springframework.boot:spring-boot-starter:2.5.3")
 }
+
+if (latestDepTest) {
+  // spring 6 requires java 17
+  otelJava {
+    minJavaVersionSupported.set(JavaVersion.VERSION_17)
+  }
+}
diff --git a/...rumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts b/...rumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts
@@ -13,6 +13,9 @@ dependencies {
 
   testLibrary("org.springframework.cloud:spring-cloud-starter-gateway:2.2.0.RELEASE")
   testLibrary("org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE")
+
+  // current latest spring cloud is not compatible with spring boot 3.4.0
+  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.3.+")
 }
 
 tasks.withType<Test>().configureEach {

diff --git a/...va/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java b/...va/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java
@@ -104,6 +104,8 @@ public void configure(IgnoredTypesBuilder builder) {
         .allowClass("org.springframework.boot.logging.logback.")
         .allowClass("org.springframework.boot.web.filter.")
         .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.actuate.metrics.web.reactive.server.MetricsWebFilter$$Lambda")
         .allowClass("org.springframework.boot.autoconfigure.BackgroundPreinitializer$")