add PHP 8.4

DataDog · Jul 16, 2024 · 37285f3 · 37285f3
1 parent 4c3832d
commit 37285f3
Show file tree

Hide file tree

Showing 21 changed files with 732 additions and 15 deletions.
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -3646,6 +3646,7 @@ workflows:
                 - "8.1"
                 - "8.2"
                 - "8.3"
+                - "8.4"
               cmake_version:
                 - "3.24.4"
               catch2_version:
@@ -3770,6 +3771,17 @@ workflows:
           abi_no: "20230831"
           triplet: "aarch64-alpine-linux-musl"
           resource_class: "arm.medium"
+      - "cargo build --release":
+          name: "Profiler PHP v8.4 - x86_64-alpine-linux-musl"
+          docker_image: "datadog/dd-trace-ci:php-compile-extension-alpine-8.4"
+          abi_no: "20230901"
+          triplet: "x86_64-alpine-linux-musl"
+      - "cargo build --release":
+          name: "Profiler PHP v8.4 - aarch64-alpine-linux-musl"
+          docker_image: "datadog/dd-trace-ci:php-compile-extension-alpine-8.4"
+          abi_no: "20230901"
+          triplet: "aarch64-alpine-linux-musl"
+          resource_class: "arm.medium"
 
       - "cache cargo deps":
           name: "cache cargo deps - x86_64-unknown-linux-gnu"
@@ -3868,6 +3880,17 @@ workflows:
           abi_no: "20230831"
           triplet: "aarch64-unknown-linux-gnu"
           resource_class: "arm.medium"
+      - "cargo build --release":
+          name: "Profiler PHP v8.4 - x86_64-unknown-linux-gnu"
+          docker_image: "datadog/dd-trace-ci:php-8.4_centos-7"
+          abi_no: "20230901"
+          triplet: "x86_64-unknown-linux-gnu"
+      - "cargo build --release":
+          name: "Profiler PHP v8.4 - aarch64-unknown-linux-gnu"
+          docker_image: "datadog/dd-trace-ci:php-8.4_centos-7"
+          abi_no: "20230901"
+          triplet: "aarch64-unknown-linux-gnu"
+          resource_class: "arm.medium"
 
       - compile_appsec_extension_centos:
           requires: [ 'Prepare Code' ]
@@ -3883,6 +3906,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
               resource_class:
                 - "medium"
                 - "arm.medium"
@@ -3901,6 +3925,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
               resource_class:
                 - "medium"
                 - "arm.medium"
@@ -3927,6 +3952,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
           resource_class: "medium"
           name: "Compile alpine x86_64 PHP << matrix.php_major_minor >>"
       - compile_alpine:
@@ -3943,6 +3969,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
           resource_class: "arm.medium"
           name: "Compile alpine aarch64 PHP << matrix.php_major_minor >>"
       - compile_rust_alpine:
@@ -3964,6 +3991,7 @@ workflows:
             - "Compile alpine x86_64 PHP 8.1"
             - "Compile alpine x86_64 PHP 8.2"
             - "Compile alpine x86_64 PHP 8.3"
+            - "Compile alpine x86_64 PHP 8.4"
           libddtrace_suffix: "-alpine"
           resource_class: "medium"
           name: "Link x86_64 alpine"
@@ -3980,6 +4008,7 @@ workflows:
             - "Compile alpine aarch64 PHP 8.1"
             - "Compile alpine aarch64 PHP 8.2"
             - "Compile alpine aarch64 PHP 8.3"
+            - "Compile alpine aarch64 PHP 8.4"
           libddtrace_suffix: "-alpine"
           resource_class: "arm.medium"
           name: "Link aarch64 alpine"
@@ -4147,6 +4176,25 @@ workflows:
           docker_image: "datadog/dd-trace-ci:php-8.3_windows"
           php_version: "8.3"
           so_suffix: "20230831"
+      - compile_extension_centos:
+          requires: [ 'Prepare Code' ]
+          name: "Compile x86_64 PHP 84 nts + zts + debug"
+          docker_image: "datadog/dd-trace-ci:php-8.4_centos-7"
+          php_version: "8.4"
+          so_suffix: "20230901"
+      - compile_extension_centos:
+          requires: [ 'Prepare Code' ]
+          name: "Compile aarch64 PHP 84 nts + zts + debug"
+          docker_image: "datadog/dd-trace-ci:php-8.4_centos-7"
+          php_version: "8.4"
+          so_suffix: "20230901"
+          resource_class: "arm.medium"
+      - compile_extension_windows:
+          requires: [ 'Prepare Code' ]
+          name: "Compile Windows PHP 84 nts + zts"
+          docker_image: "datadog/dd-trace-ci:php-8.4_windows"
+          php_version: "8.4"
+          so_suffix: "20230901"
 
       - compile_rust_centos:
           requires: [ 'Prepare Code' ]
@@ -4214,6 +4262,7 @@ workflows:
             - "Profiler PHP v8.1 - x86_64-alpine-linux-musl"
             - "Profiler PHP v8.2 - x86_64-alpine-linux-musl"
             - "Profiler PHP v8.3 - x86_64-alpine-linux-musl"
+            - "Profiler PHP v8.4 - x86_64-alpine-linux-musl"
 
             - "Profiler PHP v7.1 - x86_64-unknown-linux-gnu"
             - "Profiler PHP v7.2 - x86_64-unknown-linux-gnu"
@@ -4223,6 +4272,7 @@ workflows:
             - "Profiler PHP v8.1 - x86_64-unknown-linux-gnu"
             - "Profiler PHP v8.2 - x86_64-unknown-linux-gnu"
             - "Profiler PHP v8.3 - x86_64-unknown-linux-gnu"
+            - "Profiler PHP v8.4 - x86_64-unknown-linux-gnu"
 
             - "Profiler PHP v7.1 - aarch64-alpine-linux-musl"
             - "Profiler PHP v7.2 - aarch64-alpine-linux-musl"
@@ -4232,6 +4282,7 @@ workflows:
             - "Profiler PHP v8.1 - aarch64-alpine-linux-musl"
             - "Profiler PHP v8.2 - aarch64-alpine-linux-musl"
             - "Profiler PHP v8.3 - aarch64-alpine-linux-musl"
+            - "Profiler PHP v8.4 - aarch64-alpine-linux-musl"
 
             - "Profiler PHP v7.1 - aarch64-unknown-linux-gnu"
             - "Profiler PHP v7.2 - aarch64-unknown-linux-gnu"
@@ -4241,6 +4292,7 @@ workflows:
             - "Profiler PHP v8.1 - aarch64-unknown-linux-gnu"
             - "Profiler PHP v8.2 - aarch64-unknown-linux-gnu"
             - "Profiler PHP v8.3 - aarch64-unknown-linux-gnu"
+            - "Profiler PHP v8.4 - aarch64-unknown-linux-gnu"
 
             - "Compile Loader Linux x86_64"
             - "Compile Loader Linux aarch64"
@@ -4306,6 +4358,17 @@ workflows:
           docker_image: "datadog/dd-trace-ci:php-8.3_buster"
           so_suffix: "20230831"
           resource_class: "arm.medium"
+      - compile_extension_asan:
+          requires: [ 'Prepare Code' ]
+          name: "Compile x86_64 PHP 84 debug-zts-asan"
+          docker_image: "datadog/dd-trace-ci:php-8.4_buster"
+          so_suffix: "20230901"
+      - compile_extension_asan:
+          requires: [ 'Prepare Code' ]
+          name: "Compile aarch64 PHP 84 debug-zts-asan"
+          docker_image: "datadog/dd-trace-ci:php-8.4_buster"
+          so_suffix: "20230901"
+          resource_class: "arm.medium"
 
       - "package extension":
           name: "package extension zts-debug-asan"
@@ -4335,6 +4398,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
 
       - randomized_tests:
           requires: [ 'package extension' ]
@@ -4485,6 +4549,7 @@ workflows:
                 - php:8.1-fpm-alpine
                 - php:8.2-fpm-alpine
                 - php:8.3-fpm-alpine
+                - php:8.4-fpm-alpine
       - verify_centos:
           requires: [ "package extension" ]
           matrix:
@@ -4526,6 +4591,7 @@ workflows:
                 - PHP_VERSION=8.1
                 - PHP_VERSION=8.2
                 - PHP_VERSION=8.3
+                - PHP_VERSION=8.4
 
       - verify_tar_gz:
           requires: [ "package extension" ]
@@ -4578,6 +4644,10 @@ workflows:
           requires: [ "Build PECL" ]
           name: "PHP 83 PECL tests"
           docker_image: "datadog/dd-trace-ci:php-8.3_buster"
+      - pecl_tests:
+          requires: [ "Build PECL" ]
+          name: "PHP 84 PECL tests"
+          docker_image: "datadog/dd-trace-ci:php-8.4_buster"
 
       - integration_tests:
           requires: [ 'Prepare Code' ]
@@ -4683,6 +4753,22 @@ workflows:
           integration_testsuite: "test_web"
           docker_image: "datadog/dd-trace-ci:php-8.3_buster"
           php_major_minor: "8.3"
+      - integration_tests:
+          requires: [ 'Prepare Code' ]
+          name: "PHP 84 web tests with apache (+ opcache)"
+          resource_class: medium+
+          sapi: apache2handler
+          integration_testsuite: "test_web"
+          docker_image: "datadog/dd-trace-ci:php-8.4_buster"
+          php_major_minor: "8.4"
+      - integration_tests:
+          requires: [ 'Prepare Code' ]
+          name: "PHP 84 web tests with nginx + FastCGI"
+          resource_class: medium+
+          sapi: cgi-fcgi
+          integration_testsuite: "test_web"
+          docker_image: "datadog/dd-trace-ci:php-8.4_buster"
+          php_major_minor: "8.4"
       - integration_tests:
           requires: [ 'Prepare Code' ]
           name: "PHP 74 custom autoloaded web tests with nginx + PHP-FPM"
@@ -4783,6 +4869,7 @@ workflows:
                 - "8.1"
                 - "8.2"
                 - "8.3"
+                - "8.4"
               switch_php_version:
                 - debug
                 - zts
@@ -4819,6 +4906,7 @@ workflows:
                 - "8.1"
                 - "8.2"
                 - "8.3"
+                - "8.4"
               switch_php_version:
                 - debug
                 - zts
@@ -4872,6 +4960,7 @@ workflows:
                 - "8.1"
                 - "8.2"
                 - "8.3"
+                - "8.4"
               make_target:
                 - test_coverage
                 - test_unit
@@ -4917,6 +5006,7 @@ workflows:
                 - "8.1"
                 - "8.2"
                 - "8.3"
+                - "8.4"
               make_target:
                 - test_extension_ci
 
@@ -4932,6 +5022,7 @@ workflows:
                 - "datadog/dd-trace-ci:php-8.1_windows"
                 - "datadog/dd-trace-ci:php-8.2_windows"
                 - "datadog/dd-trace-ci:php-8.3_windows"
+                - "datadog/dd-trace-ci:php-8.4_windows"
 
       # sidecar is version independent
       - test_sidecar_sender:
@@ -4949,6 +5040,7 @@ workflows:
                 - "8.1"
                 - "8.2"
                 - "8.3"
+                - "8.4"
               switch_php_version:
                 - debug-zts-asan
 
@@ -4966,6 +5058,7 @@ workflows:
                 - "8.1"
                 - "8.2"
                 - "8.3"
+                - "8.4"
               make_target:
                 - test_coverage
       - asan:
@@ -4978,6 +5071,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
               switch_php_version:
                 - debug-zts-asan
               resource_class:
@@ -5010,6 +5104,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
               make_target:
                 - test_auto_instrumentation
                 - test_composer
@@ -5046,6 +5141,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
               make_target:
                 - test_web
                 - test_integrations
@@ -5083,6 +5179,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
               make_target:
                 - test_distributed_tracing
 
@@ -5102,6 +5199,7 @@ workflows:
                 - '8.1'
                 - '8.2'
                 - '8.3'
+                - '8.4'
               switch_php_version:
                 - nts
               make_target:
@@ -5176,11 +5274,22 @@ workflows:
           name: "PHP 83 Xdebug tests"
           docker_image: "datadog/dd-trace-ci:php-8.3_buster"
           xdebug_version_one: "3.3.0"
+      - xdebug_tests:
+          requires: [ 'Prepare Code' ]
+          name: "PHP 84 Xdebug tests"
+          docker_image: "datadog/dd-trace-ci:php-8.4_buster"
+          xdebug_version_one: "3.4.0"
 
       - placeholder:
           requires: [ 'Prepare Code' ]
           name: Language tests
 
+      - php_language_tests:
+          requires: [ 'Language tests' ]
+          name: "PHP 84 language tests"
+          xfail_list: dockerfiles/ci/xfail_tests/8.4.list
+          docker_image: "datadog/dd-trace-ci:php-8.4_buster"
+          parallel_workers: true
       - php_language_tests:
           requires: [ 'Language tests' ]
           name: "PHP 83 language tests"
@@ -5285,6 +5394,7 @@ workflows:
               - "8.1"
               - "8.2"
               - "8.3"
+              - "8.4"
             resource_class:
               - medium
               - arm.medium
@@ -5316,6 +5426,7 @@ workflows:
               - "8.1"
               - "8.2"
               - "8.3"
+              - "8.4"
             resource_class:
               - medium
               - arm.medium
@@ -5330,7 +5441,7 @@ workflows:
             targets:
               - test7.0-release test7.0-release-zts test7.1-release test7.1-release-zts test7.2-release test7.2-release-zts
               - test7.3-release test7.3-release-zts test7.4-release test7.4-release-zts test8.0-release test8.0-release-zts
-              - test8.1-release test8.1-release-zts test8.2-release test8.2-release-zts test8.3-release test8.3-release-zts
+              - test8.1-release test8.1-release-zts test8.2-release test8.2-release-zts test8.3-release test8.3-release-zts test8.4-release test8.4-release-zts
 
     - coverage_appsec:
         requires: [ hunter_cache_ubuntu ]
@@ -5434,6 +5545,15 @@ workflows:
         docker_image: "datadog/dd-trace-ci:php-compile-extension-alpine-8.3"
         triplet: "aarch64-alpine-linux-musl"
         resource_class: "arm.medium"
+    - "profiling tests":
+        name: "Profiler test PHP v8.4 - x86_64-alpine-linux-musl"
+        docker_image: "datadog/dd-trace-ci:php-compile-extension-alpine-8.4"
+        triplet: "x86_64-alpine-linux-musl"
+    - "profiling tests":
+        name: "Profiler test PHP v8.4 - aarch64-alpine-linux-musl"
+        docker_image: "datadog/dd-trace-ci:php-compile-extension-alpine-8.4"
+        triplet: "aarch64-alpine-linux-musl"
+        resource_class: "arm.medium"
 
     - "profiling tests":
         name: "Profiler test PHP v7.1 - x86_64-unknown-linux-gnu"
@@ -5507,3 +5627,12 @@ workflows:
         docker_image: "datadog/dd-trace-ci:php-8.3_centos-7"
         triplet: "aarch64-unknown-linux-gnu"
         resource_class: "arm.medium"
+    - "profiling tests":
+        name: "Profiler test PHP v8.4 - x86_64-unknown-linux-gnu"
+        docker_image: "datadog/dd-trace-ci:php-8.4_centos-7"
+        triplet: "x86_64-unknown-linux-gnu"
+    - "profiling tests":
+        name: "Profiler test PHP v8.4 - aarch64-unknown-linux-gnu"
+        docker_image: "datadog/dd-trace-ci:php-8.4_centos-7"
+        triplet: "aarch64-unknown-linux-gnu"
+        resource_class: "arm.medium"