fix

Author: trask

.github/config/latest-dep-versions.json

@@ -306,6 +306,7 @@
     "org.apache.pekko:pekko-http_2.12#+": "1.3.0",
     "org.apache.pekko:pekko-http_2.13#+": "1.3.0",
     "org.apache.pekko:pekko-http_3#+": "1.3.0",
+    "org.apache.pekko:pekko-slf4j_2.13#+": "1.5.0",
     "org.apache.pekko:pekko-stream_2.12#+": "1.4.0",
     "org.apache.pekko:pekko-stream_2.13#+": "1.5.0",
     "org.apache.pulsar:pulsar-client#+": "4.2.1",

conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts

@@ -170,14 +170,19 @@ configurations {
     // configurations stay safe by default.
     configureEach {
       if (!isCanBeResolved) return@configureEach
-      // `latestDepTestLibrary` overrides apply ONLY to test-classpath configurations.
-      // They must NOT touch `compileClasspath`, because the whole point of `library(old)` +
-      // `latestDepTestLibrary(newRange)` is to keep the agent compiling against the old API
-      // while testing against the new one. Forcing the override onto compileClasspath would
-      // upgrade the compileOnly `library(...)` version and break compilation (e.g.
-      // scala-fork-join-2.8 compiles against scala 2.8 APIs, vertx-sql-client-4.0 against
-      // generic vertx 4.0 APIs, elasticsearch-transport-5.0 against generic ES 5.0 APIs).
-      val applyOverrides = name.contains("test", ignoreCase = true)
+      // `latestDepTestLibrary` overrides apply ONLY to the main test/latestDepTest
+      // configurations. They must NOT touch `compileClasspath`, because the whole point of
+      // `library(old)` + `latestDepTestLibrary(newRange)` is to keep the agent compiling
+      // against the old API while testing against the new one. Forcing the override onto
+      // compileClasspath would upgrade the compileOnly `library(...)` version and break
+      // compilation (e.g. scala-fork-join-2.8 compiles against scala 2.8 APIs,
+      // vertx-sql-client-4.0 against generic vertx 4.0 APIs, elasticsearch-transport-5.0
+      // against generic ES 5.0 APIs). Overrides must also NOT touch custom JvmTestSuite
+      // source sets (e.g. `play24Test*`, `version20Test*`, `tapirTest*`) which declare
+      // their own explicit older versions; using `contains("test")` here would let the
+      // main suite's `latestDepTestLibrary("...:2.5.+")` upgrade play-mvc-2.4's
+      // `play24Test` classpath off Play 2.4. Use a strict prefix match instead.
+      val applyOverrides = name.startsWith("test") || name.startsWith("latestDepTest")
       // Pinning of `latest.release`/`+` versions is applied across test-related
       // configurations and the main `compileClasspath`. compileClasspath is included so
       // that modules whose `library(...)` declarations resolve `latest.release` in latest

instrumentation/kubernetes-client-7.0/javaagent/build.gradle.kts

@@ -21,12 +21,20 @@ dependencies {
 
 testing {
   suites {
-    val version20Test by registering(JvmTestSuite::class) {
+    // version22Test reuses the same test source against `latest.release` in latest-deps mode
+    // (currently 26.x), and against 22.0.0 otherwise, to exercise the upper end of the v20+
+    // builder API line.
+    val version22Test by registering(JvmTestSuite::class) {
+      sources {
+        java {
+          setSrcDirs(listOf("src/version20Test/java"))
+        }
+      }
       dependencies {
         if (otelProps.testLatestDeps) {
           implementation("io.kubernetes:client-java-api:latest.release")
         } else {
-          implementation("io.kubernetes:client-java-api:20.0.0")
+          implementation("io.kubernetes:client-java-api:22.0.0")
         }
       }
     }

instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts

@@ -71,6 +71,9 @@ testing {
           implementation("com.typesafe.akka:akka-http_2.13:latest.release")
           implementation("com.typesafe.akka:akka-stream_2.13:latest.release")
           implementation("com.softwaremill.sttp.tapir:tapir-pekko-http-server_2.13:latest.release")
+          implementation("org.apache.pekko:pekko-actor_2.13:latest.release")
+          implementation("org.apache.pekko:pekko-stream_2.13:latest.release")
+          implementation("org.apache.pekko:pekko-slf4j_2.13:latest.release")
         } else {
           implementation("org.apache.pekko:pekko-http_2.12:1.0.0")
           implementation("org.apache.pekko:pekko-stream_2.12:1.0.1")