Enable helper-rust by default also on PHP 8.4

cataphract · cataphract · commit 87adbc217208 · 2026-04-28T16:32:36.000+01:00
diff --git a/.gitlab/generate-appsec.php b/.gitlab/generate-appsec.php
@@ -192,7 +192,6 @@
           - test7.4-release
           - test8.1-release
           - test8.3-debug
-          - test8.4-release-zts
 
 "helper-rust build and test":
   stage: test
diff --git a/appsec/src/extension/configuration.h b/appsec/src/extension/configuration.h
@@ -28,7 +28,7 @@ extern bool runtime_config_first_init;
 
 #define DD_BASE(path) "/opt/datadog-php/" path
 
-#if PHP_VERSION_ID >= 80500
+#if PHP_VERSION_ID >= 80400
 #define DD_APPSEC_HELPER_RUST_REDIRECTION_DEFAULT "true"
 #else
 #define DD_APPSEC_HELPER_RUST_REDIRECTION_DEFAULT "false"
diff --git a/appsec/tests/integration/build.gradle b/appsec/tests/integration/build.gradle
@@ -636,8 +636,8 @@ def runMainTask = { String phpVersion, String variant ->
             dependsOn 'buildHelperRustWithCoverage'
         } else if (project.hasProperty('useHelperRust')) {
             dependsOn 'buildHelperRust'
-        } else if (phpVersion == '8.5') {
-            // PHP 8.5+ uses Rust helper by default via DD_APPSEC_HELPER_RUST_REDIRECTION
+        } else if (phpVersion in ['8.4', '8.5']) {
+            // PHP 8.4+ uses Rust helper by default via DD_APPSEC_HELPER_RUST_REDIRECTION
             dependsOn 'buildHelperRust'
         }
     }
@@ -714,8 +714,8 @@ def runMainTask = { String phpVersion, String variant ->
             dependsOn 'buildHelperRustWithCoverage'
         } else if (project.hasProperty('useHelperRust')) {
             dependsOn 'buildHelperRust'
-        } else if (phpVersion == '8.5') {
-            // PHP 8.5+ uses Rust helper by default via DD_APPSEC_HELPER_RUST_REDIRECTION
+        } else if (phpVersion in ['8.4', '8.5']) {
+            // PHP 8.4+ uses Rust helper by default via DD_APPSEC_HELPER_RUST_REDIRECTION
             dependsOn 'buildHelperRust'
         }
 
diff --git a/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/docker/AppSecContainer.groovy b/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/docker/AppSecContainer.groovy
@@ -494,7 +494,7 @@ class AppSecContainer<SELF extends AppSecContainer<SELF>> extends GenericContain
         } else {
             // Mount helper-rust volume so enable_extensions.sh can copy the binary
             // for the redirection mechanism (DD_APPSEC_HELPER_RUST_REDIRECTION
-            // defaults to true on PHP 8.5+)
+            // defaults to true on PHP 8.4+)
             addVolumeMount('php-helper-rust', '/helper-rust')
         }
 
diff --git a/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy b/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy
@@ -875,22 +875,22 @@ trait CommonTests {
             assert resp.statusCode() == 200
             def content = resp.body().text
 
-            if (TestParams.phpVersionAtLeast('8.5')) {
+            if (TestParams.phpVersionAtLeast('8.4')) {
                 assert content.contains('Yes (Rust)') :
-                    "PHP >= 8.5 should use Rust helper by default"
+                    "PHP >= 8.4 should use Rust helper by default"
             } else {
                 assert content.contains('Yes (C++)') :
-                    "PHP < 8.5 should use C++ helper by default"
+                    "PHP < 8.4 should use C++ helper by default"
             }
         }
 
         Span span = trace.first()
-        if (TestParams.phpVersionAtLeast('8.5')) {
+        if (TestParams.phpVersionAtLeast('8.4')) {
             assert span.meta."_dd.appsec.helper_runtime" == 'rust' :
-                "PHP >= 8.5 should report helper_runtime=rust in span"
+                "PHP >= 8.4 should report helper_runtime=rust in span"
         } else {
             assert span.meta."_dd.appsec.helper_runtime" == null :
-                "PHP < 8.5 should not set helper_runtime span tag"
+                "PHP < 8.4 should not set helper_runtime span tag"
         }
     }
 }
diff --git a/tooling/generate-supported-configurations.sh b/tooling/generate-supported-configurations.sh
@@ -394,7 +394,7 @@ extract_c_supported_configurations() {
 #define DD_SIDECAR_TRACE_SENDER_DEFAULT false
 #endif
 #undef DD_APPSEC_HELPER_RUST_REDIRECTION_DEFAULT
-#if PHP_VERSION_ID >= 80500
+#if PHP_VERSION_ID >= 80400
 #define DD_APPSEC_HELPER_RUST_REDIRECTION_DEFAULT "true"
 #else
 #define DD_APPSEC_HELPER_RUST_REDIRECTION_DEFAULT "false"

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ class AppSecContainer<SELF extends AppSecContainer<SELF>> extends GenericContain`
`494`	`494`	`} else {`
`495`	`495`	`// Mount helper-rust volume so enable_extensions.sh can copy the binary`
`496`	`496`	`// for the redirection mechanism (DD_APPSEC_HELPER_RUST_REDIRECTION`
`497`		`- // defaults to true on PHP 8.5+)`
	`497`	`+ // defaults to true on PHP 8.4+)`
`498`	`498`	`addVolumeMount('php-helper-rust', '/helper-rust')`
`499`	`499`	`}`
`500`	`500`
Original file line number	Diff line number	Diff line change
`@@ -875,22 +875,22 @@ trait CommonTests {`
`875`	`875`	`assert resp.statusCode() == 200`
`876`	`876`	`def content = resp.body().text`
`877`	`877`
`878`		`- if (TestParams.phpVersionAtLeast('8.5')) {`
	`878`	`+ if (TestParams.phpVersionAtLeast('8.4')) {`
`879`	`879`	`assert content.contains('Yes (Rust)') :`
`880`		`- "PHP >= 8.5 should use Rust helper by default"`
	`880`	`+ "PHP >= 8.4 should use Rust helper by default"`
`881`	`881`	`} else {`
`882`	`882`	`assert content.contains('Yes (C++)') :`
`883`		`- "PHP < 8.5 should use C++ helper by default"`
	`883`	`+ "PHP < 8.4 should use C++ helper by default"`
`884`	`884`	`}`
`885`	`885`	`}`
`886`	`886`
`887`	`887`	`Span span = trace.first()`
`888`		`- if (TestParams.phpVersionAtLeast('8.5')) {`
	`888`	`+ if (TestParams.phpVersionAtLeast('8.4')) {`
`889`	`889`	`assert span.meta."_dd.appsec.helper_runtime" == 'rust' :`
`890`		`- "PHP >= 8.5 should report helper_runtime=rust in span"`
	`890`	`+ "PHP >= 8.4 should report helper_runtime=rust in span"`
`891`	`891`	`} else {`
`892`	`892`	`assert span.meta."_dd.appsec.helper_runtime" == null :`
`893`		`- "PHP < 8.5 should not set helper_runtime span tag"`
	`893`	`+ "PHP < 8.4 should not set helper_runtime span tag"`
`894`	`894`	`}`
`895`	`895`	`}`
`896`	`896`	`}`