Reactor core: test latest versions (#7595)

DataDog · Sep 10, 2024 · f7ff143 · f7ff143
1 parent ff190af
commit f7ff143
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle b/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle
@@ -21,7 +21,7 @@ dependencies {
   testImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
   testImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1.28.0'
 
-  latestDepTestImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.4.+'
+  latestDepTestImplementation group: 'io.projectreactor', name: 'reactor-core', version: '+'
   // Looks like later versions on reactor need this dependency for some reason even though it is marked as optional.
   latestDepTestImplementation group: 'io.micrometer', name: 'micrometer-core', version: '1.+'
 }
diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile
@@ -47,14 +47,14 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe
 commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 de.thetaphi:forbiddenapis:3.1=compileClasspath
 info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath
-io.micrometer:micrometer-commons:1.13.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-io.micrometer:micrometer-core:1.13.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-io.micrometer:micrometer-observation:1.13.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+io.micrometer:micrometer-commons:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+io.micrometer:micrometer-core:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+io.micrometer:micrometer-observation:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-api:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentelemetry:opentelemetry-context:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-core:3.1.0.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.projectreactor:reactor-core:3.4.41=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+io.projectreactor:reactor-core:3.6.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 io.sqreen:libsqreen:11.0.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
 javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:1.2.0=spotbugs
@@ -81,7 +81,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
 org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
 org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
 org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
 org.codehaus.groovy:groovy-all:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-ant:2.5.14=codenarc
@@ -126,14 +126,16 @@ org.hdrhistogram:HdrHistogram:2.2.2=latestDepTestRuntimeClasspath
 org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.9.0=latestDepTestCompileClasspath,testCompileClasspath
+org.junit.platform:junit-platform-commons:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.9.0=latestDepTestCompileClasspath,testCompileClasspath
+org.junit.platform:junit-platform-engine:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-launcher:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-runner:1.9.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-api:1.9.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-suite-commons:1.9.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=latestDepTestRuntimeClasspath
 org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy
@@ -373,7 +373,7 @@ class ReactorCoreTest extends AgentTestRunner {
     where:
     schedulerName | scheduler
     "parallel"    | Schedulers.parallel()
-    "elastic"     | Schedulers.elastic()
+    "elastic"     | (isLatestDepTest ? Schedulers."boundedElastic"() : Schedulers."elastic"())
     "single"      | Schedulers.single()
     "immediate"   | Schedulers.immediate()
   }