Merge remote-tracking branch 'origin/master' into levi/panic_abort

Author: morrisonlevi

.github/workflows/prof_correctness.yml

@@ -79,8 +79,8 @@ jobs:
               mkdir -p profiling/tests/correctness/"$test_case"/
               export DD_PROFILING_OUTPUT_PPROF=$PWD/profiling/tests/correctness/"$test_case"/test.pprof
               php -d extension=$PWD/target/release/libdatadog_php_profiling.so profiling/tests/correctness/"$test_case".php
-              if [ -f "$DD_PROFILING_OUTPUT_PPROF".1.lz4 ]; then
-                echo "File $DD_PROFILING_OUTPUT_PPROF.1.lz4 should not exist!"
+              if [ -f "$DD_PROFILING_OUTPUT_PPROF".1.zst ]; then
+                echo "File $DD_PROFILING_OUTPUT_PPROF.1.zst should not exist!"
                 exit 1;
               fi
           done

.gitlab/ci-images.yml

@@ -20,6 +20,7 @@ CentOS:
     matrix:
       - PHP_VERSION:
         - base
+        - php-8.5
         - php-8.4
         - php-8.3
         - php-8.2
@@ -47,6 +48,7 @@ Alpine:
     matrix:
       - PHP_VERSION:
         - base-alpine
+        - 8.5-alpine
         - 8.4-alpine
         - 8.3-alpine
         - 8.2-alpine
@@ -74,6 +76,7 @@ Bookworm:
     matrix:
       - PHP_VERSION:
         - base
+        - php-8.5
         - php-8.4
         - php-8.3
         - php-8.2
@@ -103,6 +106,7 @@ Buster:
     matrix:
       - PHP_VERSION:
         - base
+        - php-8.5
         - php-8.4
         - php-8.3
         - php-8.2

.gitlab/generate-appsec.php

@@ -132,6 +132,8 @@
           - test8.3-release-zts
           - test8.4-release
           - test8.4-release-zts
+          - test8.5-release
+          - test8.5-release-zts
   before_script:
 <?php echo $ecrLoginSnippet, "\n"; ?>
   script:

.gitlab/generate-common.php

@@ -13,6 +13,7 @@
     "8.2" => "20220829",
     "8.3" => "20230831",
     "8.4" => "20240924",
+    "8.5" => "20250925",
 ];
 
 $all_minor_major_targets = array_keys($php_versions_to_abi);

.gitlab/generate-package.php

@@ -506,14 +506,17 @@
     # Start the container
     docker run -v ${pwd}:C:\Users\ContainerAdministrator\app -d --name ${CONTAINER_NAME} ${IMAGE} ping -t localhost
 
-    # Build nts
-    docker exec ${CONTAINER_NAME} powershell.exe "cd app; switch-php nts; C:\php\SDK\phpize.bat; .\configure.bat --enable-debug-pack; nmake; move x64\Release\php_ddtrace.dll extensions_x86_64\php_ddtrace-${ABI_NO}.dll; move x64\Release\php_ddtrace.pdb extensions_x86_64_debugsymbols\php_ddtrace-${ABI_NO}.pdb"
+    # Build nts (fail fast on any step)
+    docker exec ${CONTAINER_NAME} powershell.exe -Command "`$ErrorActionPreference='Stop'; `$PSNativeCommandUseErrorActionPreference=`$true; cd app; switch-php nts; & 'C:\\php\\SDK\\phpize.bat'; if (`$LASTEXITCODE -ne 0) { exit `$LASTEXITCODE }; .\\configure.bat --enable-debug-pack; if (`$LASTEXITCODE -ne 0) { exit `$LASTEXITCODE }; nmake; if (`$LASTEXITCODE -ne 0) { exit `$LASTEXITCODE }; Move-Item x64\\Release\\php_ddtrace.dll extensions_x86_64\\php_ddtrace-${ABI_NO}.dll -ErrorAction Stop; Move-Item x64\\Release\\php_ddtrace.pdb extensions_x86_64_debugsymbols\\php_ddtrace-${ABI_NO}.pdb -ErrorAction Stop"
+    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
-    # Reuse libdatadog build
-    docker exec ${CONTAINER_NAME} powershell.exe "mkdir app\x64\Release_TS; mv app\x64\Release\target app\x64\Release_TS\target"
+    # Reuse libdatadog build (fail if move fails)
+    docker exec ${CONTAINER_NAME} powershell.exe -Command "`$ErrorActionPreference='Stop'; `$PSNativeCommandUseErrorActionPreference=`$true; New-Item -ItemType Directory -Force -Path 'app\\x64\\Release_TS' | Out-Null; Move-Item 'app\\x64\\Release\\target' 'app\\x64\\Release_TS\\target' -ErrorAction Stop"
+    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
-    # Build zts
-    docker exec ${CONTAINER_NAME} powershell.exe "cd app; switch-php zts; C:\php\SDK\phpize.bat; .\configure.bat --enable-debug-pack; nmake; move x64\Release_TS\php_ddtrace.dll extensions_x86_64\php_ddtrace-${ABI_NO}-zts.dll; move x64\Release_TS\php_ddtrace.pdb extensions_x86_64_debugsymbols\php_ddtrace-${ABI_NO}-zts.pdb"
+    # Build zts (fail fast on any step)
+    docker exec ${CONTAINER_NAME} powershell.exe -Command "`$ErrorActionPreference='Stop'; `$PSNativeCommandUseErrorActionPreference=`$true; cd app; switch-php zts; & 'C:\\php\\SDK\\phpize.bat'; if (`$LASTEXITCODE -ne 0) { exit `$LASTEXITCODE }; .\\configure.bat --enable-debug-pack; if (`$LASTEXITCODE -ne 0) { exit `$LASTEXITCODE }; nmake; if (`$LASTEXITCODE -ne 0) { exit `$LASTEXITCODE }; Move-Item x64\\Release_TS\\php_ddtrace.dll extensions_x86_64\\php_ddtrace-${ABI_NO}-zts.dll -ErrorAction Stop; Move-Item x64\\Release_TS\\php_ddtrace.pdb extensions_x86_64_debugsymbols\\php_ddtrace-${ABI_NO}-zts.pdb -ErrorAction Stop"
+    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
     # Try to stop the container, don't care if we fail
     try { docker stop -t 5 ${CONTAINER_NAME} } catch { }

.gitlab/generate-tracer.php

@@ -654,6 +654,7 @@ function before_script_steps() {
     ["8.2", "3.2.2"],
     ["8.3", "3.3.2"],
     ["8.4", "3.4.0"],
+    // ["8.5", "3.5.0"], Xdebug not supported yet on 8.5
 ];
 foreach ($xdebug_test_matrix as [$major_minor, $xdebug]):
 ?>