fix(php): profiling marker checks

mirror_images.yaml

@@ -15,22 +15,22 @@
 - "datadog/dd-appsec-php-ci:php-8.0-release"
 - "datadog/dd-appsec-php-ci:php-8.2-release"
 - "datadog/serverless-init:1.10.4"
-- "datadog/system-tests:apache-mod-7.0-zts.base-c32a9f8fabfa"
-- "datadog/system-tests:apache-mod-7.0.base-d171f9d9cd49"
-- "datadog/system-tests:apache-mod-7.1-zts.base-f85be52b50fb"
-- "datadog/system-tests:apache-mod-7.1.base-3f1b6ccb42bf"
-- "datadog/system-tests:apache-mod-7.2-zts.base-d72a52462af8"
-- "datadog/system-tests:apache-mod-7.2.base-97b4ad113bf7"
-- "datadog/system-tests:apache-mod-7.3-zts.base-474465995b7d"
-- "datadog/system-tests:apache-mod-7.3.base-7b5f5e879531"
-- "datadog/system-tests:apache-mod-7.4-zts.base-70c7e290c9da"
-- "datadog/system-tests:apache-mod-7.4.base-c9eeb1f5d7a0"
-- "datadog/system-tests:apache-mod-8.0-zts.base-14f418bd9fe1"
-- "datadog/system-tests:apache-mod-8.0.base-8eb5122e172d"
-- "datadog/system-tests:apache-mod-8.1-zts.base-730619193062"
-- "datadog/system-tests:apache-mod-8.1.base-636387903f6f"
-- "datadog/system-tests:apache-mod-8.2-zts.base-e2da877df5a0"
-- "datadog/system-tests:apache-mod-8.2.base-35dff2a6fda0"
+- "datadog/system-tests:apache-mod-7.0-zts.base-dd487d1bfd1c"
+- "datadog/system-tests:apache-mod-7.0.base-aa86a7e5577e"
+- "datadog/system-tests:apache-mod-7.1-zts.base-4d0ee0b32405"
+- "datadog/system-tests:apache-mod-7.1.base-50a80dfecdb3"
+- "datadog/system-tests:apache-mod-7.2-zts.base-50db1686b7dc"
+- "datadog/system-tests:apache-mod-7.2.base-4a9fbc297018"
+- "datadog/system-tests:apache-mod-7.3-zts.base-795e125533dd"
+- "datadog/system-tests:apache-mod-7.3.base-02199e64b92d"
+- "datadog/system-tests:apache-mod-7.4-zts.base-df6e77f157d2"
+- "datadog/system-tests:apache-mod-7.4.base-895506a0fd71"
+- "datadog/system-tests:apache-mod-8.0-zts.base-7b36aedcfee7"
+- "datadog/system-tests:apache-mod-8.0.base-75b9524549b3"
+- "datadog/system-tests:apache-mod-8.1-zts.base-7419c413ba48"
+- "datadog/system-tests:apache-mod-8.1.base-fcc64190c5d9"
+- "datadog/system-tests:apache-mod-8.2-zts.base-6f8acca06b89"
+- "datadog/system-tests:apache-mod-8.2.base-407dc6bf9344"
 - "datadog/system-tests:django-poc.base-78e2159815b1"
 - "datadog/system-tests:django-py3.13.base-d8262a2c816c"
 - "datadog/system-tests:express4-typescript.base-1502d45c1d2d"
@@ -47,15 +47,15 @@
 - "datadog/system-tests:nodejs-lambda-runtime.base-f7f78c7298cf"
 - "datadog/system-tests:nodejs_buddy-v1"
 - "datadog/system-tests:openai-py.base-b4fd56aee3f2"
-- "datadog/system-tests:php-fpm-7.0.base-c49018c745e1"
-- "datadog/system-tests:php-fpm-7.1.base-910d557560fe"
-- "datadog/system-tests:php-fpm-7.2.base-3fc07ca7d612"
-- "datadog/system-tests:php-fpm-7.3.base-57170013e791"
-- "datadog/system-tests:php-fpm-7.4.base-5785e22b9e7a"
-- "datadog/system-tests:php-fpm-8.0.base-f188ce9edd45"
-- "datadog/system-tests:php-fpm-8.1.base-0e71904f30d8"
-- "datadog/system-tests:php-fpm-8.2.base-1be933a8c32c"
-- "datadog/system-tests:php-fpm-8.5.base-1f31aeca4e5b"
+- "datadog/system-tests:php-fpm-7.0.base-029d022d4ada"
+- "datadog/system-tests:php-fpm-7.1.base-dcc21ae5d678"
+- "datadog/system-tests:php-fpm-7.2.base-b0cc5848dc1d"
+- "datadog/system-tests:php-fpm-7.3.base-127ad9f9ea60"
+- "datadog/system-tests:php-fpm-7.4.base-2ef8e06354d7"
+- "datadog/system-tests:php-fpm-8.0.base-9cf37cf8763f"
+- "datadog/system-tests:php-fpm-8.1.base-258c3ae4c142"
+- "datadog/system-tests:php-fpm-8.2.base-61d56dbb3829"
+- "datadog/system-tests:php-fpm-8.5.base-b27ba28956cb"
 - "datadog/system-tests:proxy-v1"
 - "datadog/system-tests:python-lambda-runtime.base-944cdc8541b3"
 - "datadog/system-tests:python3.12.base-604705958847"

utils/build/docker/base-images.lock.json

@@ -8,31 +8,31 @@
     "system_tests_base_nodejs_fastify": "datadog/system-tests:fastify.base-a1ef28556ea8",
     "system_tests_base_nodejs_lambda_nodejs_lambda_runtime": "datadog/system-tests:nodejs-lambda-runtime.base-f7f78c7298cf",
     "system_tests_base_nodejs_nextjs": "datadog/system-tests:nextjs.base-95582a903467",
-    "system_tests_base_php_apache_mod_7_0": "datadog/system-tests:apache-mod-7.0.base-d171f9d9cd49",
-    "system_tests_base_php_apache_mod_7_0_zts": "datadog/system-tests:apache-mod-7.0-zts.base-c32a9f8fabfa",
-    "system_tests_base_php_apache_mod_7_1": "datadog/system-tests:apache-mod-7.1.base-3f1b6ccb42bf",
-    "system_tests_base_php_apache_mod_7_1_zts": "datadog/system-tests:apache-mod-7.1-zts.base-f85be52b50fb",
-    "system_tests_base_php_apache_mod_7_2": "datadog/system-tests:apache-mod-7.2.base-97b4ad113bf7",
-    "system_tests_base_php_apache_mod_7_2_zts": "datadog/system-tests:apache-mod-7.2-zts.base-d72a52462af8",
-    "system_tests_base_php_apache_mod_7_3": "datadog/system-tests:apache-mod-7.3.base-7b5f5e879531",
-    "system_tests_base_php_apache_mod_7_3_zts": "datadog/system-tests:apache-mod-7.3-zts.base-474465995b7d",
-    "system_tests_base_php_apache_mod_7_4": "datadog/system-tests:apache-mod-7.4.base-c9eeb1f5d7a0",
-    "system_tests_base_php_apache_mod_7_4_zts": "datadog/system-tests:apache-mod-7.4-zts.base-70c7e290c9da",
-    "system_tests_base_php_apache_mod_8_0": "datadog/system-tests:apache-mod-8.0.base-8eb5122e172d",
-    "system_tests_base_php_apache_mod_8_0_zts": "datadog/system-tests:apache-mod-8.0-zts.base-14f418bd9fe1",
-    "system_tests_base_php_apache_mod_8_1": "datadog/system-tests:apache-mod-8.1.base-636387903f6f",
-    "system_tests_base_php_apache_mod_8_1_zts": "datadog/system-tests:apache-mod-8.1-zts.base-730619193062",
-    "system_tests_base_php_apache_mod_8_2": "datadog/system-tests:apache-mod-8.2.base-35dff2a6fda0",
-    "system_tests_base_php_apache_mod_8_2_zts": "datadog/system-tests:apache-mod-8.2-zts.base-e2da877df5a0",
-    "system_tests_base_php_php_fpm_7_0": "datadog/system-tests:php-fpm-7.0.base-c49018c745e1",
-    "system_tests_base_php_php_fpm_7_1": "datadog/system-tests:php-fpm-7.1.base-910d557560fe",
-    "system_tests_base_php_php_fpm_7_2": "datadog/system-tests:php-fpm-7.2.base-3fc07ca7d612",
-    "system_tests_base_php_php_fpm_7_3": "datadog/system-tests:php-fpm-7.3.base-57170013e791",
-    "system_tests_base_php_php_fpm_7_4": "datadog/system-tests:php-fpm-7.4.base-5785e22b9e7a",
-    "system_tests_base_php_php_fpm_8_0": "datadog/system-tests:php-fpm-8.0.base-f188ce9edd45",
-    "system_tests_base_php_php_fpm_8_1": "datadog/system-tests:php-fpm-8.1.base-0e71904f30d8",
-    "system_tests_base_php_php_fpm_8_2": "datadog/system-tests:php-fpm-8.2.base-1be933a8c32c",
-    "system_tests_base_php_php_fpm_8_5": "datadog/system-tests:php-fpm-8.5.base-1f31aeca4e5b",
+    "system_tests_base_php_apache_mod_7_0": "datadog/system-tests:apache-mod-7.0.base-aa86a7e5577e",
+    "system_tests_base_php_apache_mod_7_0_zts": "datadog/system-tests:apache-mod-7.0-zts.base-dd487d1bfd1c",
+    "system_tests_base_php_apache_mod_7_1": "datadog/system-tests:apache-mod-7.1.base-50a80dfecdb3",
+    "system_tests_base_php_apache_mod_7_1_zts": "datadog/system-tests:apache-mod-7.1-zts.base-4d0ee0b32405",
+    "system_tests_base_php_apache_mod_7_2": "datadog/system-tests:apache-mod-7.2.base-4a9fbc297018",
+    "system_tests_base_php_apache_mod_7_2_zts": "datadog/system-tests:apache-mod-7.2-zts.base-50db1686b7dc",
+    "system_tests_base_php_apache_mod_7_3": "datadog/system-tests:apache-mod-7.3.base-02199e64b92d",
+    "system_tests_base_php_apache_mod_7_3_zts": "datadog/system-tests:apache-mod-7.3-zts.base-795e125533dd",
+    "system_tests_base_php_apache_mod_7_4": "datadog/system-tests:apache-mod-7.4.base-895506a0fd71",
+    "system_tests_base_php_apache_mod_7_4_zts": "datadog/system-tests:apache-mod-7.4-zts.base-df6e77f157d2",
+    "system_tests_base_php_apache_mod_8_0": "datadog/system-tests:apache-mod-8.0.base-75b9524549b3",
+    "system_tests_base_php_apache_mod_8_0_zts": "datadog/system-tests:apache-mod-8.0-zts.base-7b36aedcfee7",
+    "system_tests_base_php_apache_mod_8_1": "datadog/system-tests:apache-mod-8.1.base-fcc64190c5d9",
+    "system_tests_base_php_apache_mod_8_1_zts": "datadog/system-tests:apache-mod-8.1-zts.base-7419c413ba48",
+    "system_tests_base_php_apache_mod_8_2": "datadog/system-tests:apache-mod-8.2.base-407dc6bf9344",
+    "system_tests_base_php_apache_mod_8_2_zts": "datadog/system-tests:apache-mod-8.2-zts.base-6f8acca06b89",
+    "system_tests_base_php_php_fpm_7_0": "datadog/system-tests:php-fpm-7.0.base-029d022d4ada",
+    "system_tests_base_php_php_fpm_7_1": "datadog/system-tests:php-fpm-7.1.base-dcc21ae5d678",
+    "system_tests_base_php_php_fpm_7_2": "datadog/system-tests:php-fpm-7.2.base-b0cc5848dc1d",
+    "system_tests_base_php_php_fpm_7_3": "datadog/system-tests:php-fpm-7.3.base-127ad9f9ea60",
+    "system_tests_base_php_php_fpm_7_4": "datadog/system-tests:php-fpm-7.4.base-2ef8e06354d7",
+    "system_tests_base_php_php_fpm_8_0": "datadog/system-tests:php-fpm-8.0.base-9cf37cf8763f",
+    "system_tests_base_php_php_fpm_8_1": "datadog/system-tests:php-fpm-8.1.base-258c3ae4c142",
+    "system_tests_base_php_php_fpm_8_2": "datadog/system-tests:php-fpm-8.2.base-61d56dbb3829",
+    "system_tests_base_php_php_fpm_8_5": "datadog/system-tests:php-fpm-8.5.base-b27ba28956cb",
     "system_tests_base_python_django_poc": "datadog/system-tests:django-poc.base-78e2159815b1",
     "system_tests_base_python_django_py3_13": "datadog/system-tests:django-py3.13.base-d8262a2c816c",
     "system_tests_base_python_fastapi": "datadog/system-tests:fastapi.base-2917769b3665",

utils/build/docker/php/common/install_ddtrace.sh

@@ -77,9 +77,14 @@ if [ "$(printf '%s\n' "7.1" "$PHP_VERSION" | sort -V | head -n1)" = "7.1" ]; the
   # Only enable profiling if the bundle actually contains a profiling extension.
   # When installing from a local package that was built without profiling support,
   # passing --enable-profiling causes datadog-setup.php to exit with an error.
+  # Older packages ship a separate "datadog-profiling[.-]*" binary; newer combined
+  # (tracer+profiling in one ddtrace.so) packages instead ship a per-API-version
+  # marker file named ".ddtrace[-zts|-debug].profiling" (see datadog-setup.php's
+  # $shouldInstallProfiling). Check for either so this works regardless of which
+  # package format is being installed.
   PKG_HAS_PROFILING=0
   if [ -n "${PKG:-}" ]; then
-    if tar -tzf "$PKG" 2>/dev/null | grep -q "datadog-profiling"; then
+    if tar -tzf "$PKG" 2>/dev/null | grep -q -e "datadog-profiling" -e '\.ddtrace\(-zts\|-debug\)\?\.profiling$'; then
       PKG_HAS_PROFILING=1
     fi
   else