[mq] [skip ddci] working branch - merge d51e352 on top of master at 5447e79

{"baseBranch":"master","baseCommit":"5447e796c3c80bafbdd1369758601e7e44272936","createdAt":"2026-10-08T08:39:51.833073Z","headSha":"d51e3525176ad368fd30fc7fccd093f9f97cb347","id":"277c5f46-5d00-49d4-8c3e-418b7e7921bc","priority":"200","pullRequestNumber":"12753","queuedAt":"2026-10-08T08:39:51.831806Z","retryAttempt":"1","status":"STATUS_QUEUED"}

Author: gh-worker-dd-mergequeue-cf854d[bot]

dd-java-agent/instrumentation/cucumber-5.4/build.gradle

@@ -12,6 +12,7 @@ muzzle {
   }
 }
 
+addTestSuiteForDir('latest7Test', 'test')
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
@@ -26,4 +27,14 @@ dependencies {
 
   latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-java', version: '+'
   latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '+'
+
+  latest7TestImplementation group: 'io.cucumber', name: 'cucumber-java', version: '7.+'
+  latest7TestImplementation group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '7.+'
+}
+
+// cucumber 8.0.0+ requires Java 17
+tasks.named("latestDepTest", Test) {
+  testJvmConstraints {
+    minJavaVersion = JavaVersion.VERSION_17
+  }
 }

dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile

@@ -11,6 +11,7 @@ muzzle {
   }
 }
 
+addTestSuiteForDir('latest7Test', 'test')
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
@@ -33,4 +34,14 @@ dependencies {
 
   latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-java', version: '+'
   latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-junit', version: '+'
+
+  latest7TestImplementation group: 'io.cucumber', name: 'cucumber-java', version: '7.+'
+  latest7TestImplementation group: 'io.cucumber', name: 'cucumber-junit', version: '7.+'
+}
+
+// cucumber 8.0.0+ requires Java 17
+tasks.named("latestDepTest", Test) {
+  testJvmConstraints {
+    minJavaVersion = JavaVersion.VERSION_17
+  }
 }

dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/build.gradle

@@ -14,6 +14,7 @@ muzzle {
 
 addTestSuiteForDir('cucumber723Test', 'test')
 addTestSuiteForDir('cucumber76Test', 'test')
+addTestSuiteForDir('latest7Test', 'test')
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
@@ -35,6 +36,9 @@ dependencies {
   latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-java', version: '+'
   latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '+'
 
+  latest7TestImplementation group: 'io.cucumber', name: 'cucumber-java', version: '7.+'
+  latest7TestImplementation group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '7.+'
+
   cucumber76TestImplementation group: 'io.cucumber', name: 'cucumber-java', version: '7.6.0'
   cucumber76TestImplementation group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '7.6.0'
 
@@ -48,3 +52,10 @@ configurations.matching({ it.name.startsWith('test') || it.name.startsWith('cucu
     force group: 'org.junit.platform', name: 'junit-platform-suite', version: libs.versions.junit.platform.get()
   }
 })
+
+// cucumber 8.0.0+ requires Java 17
+tasks.named("latestDepTest", Test) {
+  testJvmConstraints {
+    minJavaVersion = JavaVersion.VERSION_17
+  }
+}

dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/gradle.lockfile

@@ -5,7 +5,6 @@ import datadog.trace.civisibility.CiVisibilityInstrumentationTest
 import datadog.trace.instrumentation.junit5.JUnitPlatformUtils
 import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder
 import datadog.trace.util.ComparableVersion
-import io.cucumber.core.api.TypeRegistry
 import io.cucumber.core.options.Constants
 import org.junit.platform.engine.DiscoverySelector
 import org.junit.platform.engine.TestExecutionResult
@@ -234,7 +233,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest {
   }
 
   private boolean usesFlatExampleNaming() {
-    def version = TypeRegistry.package.getImplementationVersion()
+    def version = Constants.package.getImplementationVersion()
     // 5.4.0 does not populate the package version; cucumber 7.11.0 switched from the flat
     // "Example #<row>" naming to "Example #<examplesBlock>.<row>".
     return version == null || new ComparableVersion(version) < new ComparableVersion("7.11.0")
@@ -282,7 +281,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest {
 
   @Override
   String instrumentedLibraryVersion() {
-    def version = TypeRegistry.package.getImplementationVersion()
+    def version = Constants.package.getImplementationVersion()
     return version != null ? version : "5.4.0" // older releases do not have package version populated
   }