Avoid failing tests to report success

.github/workflows/prof_asan.yml

@@ -10,7 +10,7 @@ jobs:
       matrix:
         php-version: [8.3, 8.4]
     container:
-      image: datadog/dd-trace-ci:php-${{matrix.php-version}}_bookworm-5
+      image: datadog/dd-trace-ci:php-${{matrix.php-version}}_bookworm-6
       # https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
       options: --user root --privileged
 

.gitlab/generate-appsec.php

@@ -68,7 +68,7 @@
 "test appsec extension":
   stage: test
   extends: .appsec_test
-  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
+  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6
   variables:
     KUBERNETES_CPU_REQUEST: 3
     KUBERNETES_MEMORY_REQUEST: 3Gi
@@ -150,7 +150,7 @@
 "appsec code coverage":
   stage: test
   extends: .appsec_test
-  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-5
+  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-6
   variables:
     KUBERNETES_CPU_REQUEST: 3
     KUBERNETES_MEMORY_REQUEST: 3Gi
@@ -253,7 +253,7 @@
 "appsec lint":
   stage: test
   extends: .appsec_test
-  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-5
+  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-6
   variables:
     KUBERNETES_CPU_REQUEST: 3
     KUBERNETES_MEMORY_REQUEST: 9Gi
@@ -275,7 +275,7 @@
 "test appsec helper asan":
   stage: test
   extends: .appsec_test
-  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-5
+  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-6
   variables:
     KUBERNETES_CPU_REQUEST: 3
     KUBERNETES_MEMORY_REQUEST: 3Gi
@@ -301,7 +301,7 @@
 #"fuzz appsec helper":
 #  stage: test
 #  extends: .appsec_test
-#  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-5
+#  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-6
 #  variables:
 #    KUBERNETES_CPU_REQUEST: 3
 #    KUBERNETES_MEMORY_REQUEST: 5Gi

.gitlab/generate-package.php

@@ -48,13 +48,13 @@
 $asan_build_platforms = [
     [
         "triplet" => "x86_64-unknown-linux-gnu",
-        "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-5",
+        "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-6",
         "arch" => "amd64",
         "host_os" => "linux-gnu",
     ],
     [
         "triplet" => "aarch64-unknown-linux-gnu",
-        "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-5",
+        "image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-6",
         "arch" => "arm64",
         "host_os" => "linux-gnu",
     ]
@@ -282,7 +282,7 @@
 
 "pecl build":
   stage: tracing
-  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-5"
+  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-6"
   tags: [ "arch:amd64" ]
   needs: [ "prepare code" ]
   script:
@@ -332,7 +332,7 @@
 <?php foreach ($arch_targets as $arch): ?>
 "aggregate tracing extension: [<?= $arch ?>]":
   stage: tracing
-  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-5"
+  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-6"
   tags: [ "arch:amd64" ]
   script: ls ./
   variables:
@@ -1084,7 +1084,7 @@
 
 "pecl tests":
   stage: verify
-  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_VERSION}_bookworm-5"
+  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_VERSION}_bookworm-6"
   tags: [ "arch:amd64" ]
   services:
     - !reference [.services, request-replayer]
@@ -1235,7 +1235,7 @@
   variables:
     VALGRIND: false
     ARCH: "<?= $arch ?>"
-    CONTAINER_SUFFIX: bookworm-5
+    CONTAINER_SUFFIX: bookworm-6
   needs:
     - job: "package loader: [<?= $arch ?>]"
       artifacts: true

.gitlab/generate-profiler.php

@@ -58,7 +58,7 @@
 "clippy NTS":
   stage: test
   tags: [ "arch:amd64" ]
-  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
+  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6
   variables:
     KUBERNETES_CPU_REQUEST: 5
     KUBERNETES_MEMORY_REQUEST: 3Gi

.gitlab/generate-shared.php

@@ -21,7 +21,7 @@
       - IMAGE:
         - "datadog/dd-trace-ci:centos-7"
         - "datadog/dd-trace-ci:php-compile-extension-alpine"
-        - "datadog/dd-trace-ci:bookworm-5"
+        - "datadog/dd-trace-ci:bookworm-6"
   script:
     - if [ -f "/opt/libuv/lib/pkgconfig/libuv.pc" ]; then export PKG_CONFIG_PATH="/opt/libuv/lib/pkgconfig:$PKG_CONFIG_PATH"; fi
     - if [ -d "/opt/catch2" ]; then export CMAKE_PREFIX_PATH=/opt/catch2; fi
@@ -39,7 +39,7 @@
 "C components UBSAN":
   tags: [ "arch:amd64" ]
   stage: test
-  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-5"
+  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-6"
   needs: []
   script:
     - if [ -f "/opt/libuv/lib/pkgconfig/libuv.pc" ]; then export PKG_CONFIG_PATH="/opt/libuv/lib/pkgconfig:$PKG_CONFIG_PATH"; fi
@@ -57,7 +57,7 @@
 "Build & Test Tea":
   tags: [ "arch:amd64" ]
   stage: build
-  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5"
+  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6"
   parallel:
     matrix:
       - PHP_MAJOR_MINOR: *no_asan_minor_major_targets
@@ -80,7 +80,7 @@
 .tea_test:
   tags: [ "arch:amd64" ]
   stage: test
-  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5"
+  image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6"
   interruptible: true
   rules:
     - if: $CI_COMMIT_BRANCH == "master"

.gitlab/generate-tracer.php

@@ -66,7 +66,7 @@ function before_script_steps($with_docker_auth = false) {
 "compile extension: debug":
   stage: compile
   tags: [ "arch:${ARCH}" ]
-  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
+  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6
   parallel:
     matrix:
       - PHP_MAJOR_MINOR: *all_minor_major_targets
@@ -194,7 +194,7 @@ function before_script_steps($with_docker_auth = false) {
 .base_test:
   stage: test
   tags: [ "arch:${ARCH}" ]
-  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
+  image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6
   timeout: 60m
   interruptible: true
   rules:

Makefile

@@ -1210,8 +1210,8 @@ define run_tests_debug
 	(set -o pipefail; { $(call run_tests,$(1)) 2>&1 >&3 | \
 		tee >(grep --line-buffered -vE '\[ddtrace\] \[debug\]|\[ddtrace\] \[info\]' >&2) | \
 		{ ! (grep --line-buffered -E '\[error\]|\[warning\]|\[deprecated\]' >/dev/null && \
-		echo $$'\033[41m'"ERROR: Found debug log errors in the output."$$'\033[0m'); }; } 3>&1); \
-	timeout 10 bash -c 'wait' 2>/dev/null || true
+		echo $$'\033[41m'"ERROR: Found debug log errors in the output."$$'\033[0m'); }; } 3>&1 \
+	) && ([ -n "${DD_TRACE_DOCKER_DEBUG}" ] || timeout 10 bash -c 'wait' 2>/dev/null || true) \
 	$(eval TEST_EXTRA_ENV=)
 endef
 

dockerfiles/ci/bookworm/.env

@@ -1,2 +1,2 @@
 BOOKWORM_CURRENT_VERSION=6
-BOOKWORM_NEXT_VERSION=7
+BOOKWORM_NEXT_VERSION=6

dockerfiles/ci/bookworm/docker-compose.yml

@@ -22,8 +22,8 @@ services:
       args:
         <<: *build-base
         phpVersion: "8.5"
-        phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC3.tar.gz
-        phpSha256Hash: "937e544d72ee1eb28d2190cadaadf8e5e8d7d8c365b5c1f6a99b4f979a1f3a1b"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.5.1.tar.gz
+        phpSha256Hash: "915492958081409a5e3ef99df969bcfa5b33bdf9517bd077991747e17fa2c1b7"
 
   php-8.4:
     image: datadog/dd-trace-ci:php-8.4_bookworm-$BOOKWORM_NEXT_VERSION
@@ -34,8 +34,8 @@ services:
       args:
         <<: *build-base
         phpVersion: "8.4"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.4.6.tar.gz
-        phpSha256Hash: "49be0f2f45c9b07c9b921d023bf28b1fc781700c829869725681300e72e3faa8"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.4.16.tar.gz
+        phpSha256Hash: "8e35d24f148ea7c2a93e9b9bcc329e8bf78b5bb922f3723a727c74c19d184e98"
 
   php-8.3:
     image: datadog/dd-trace-ci:php-8.3_bookworm-$BOOKWORM_NEXT_VERSION
@@ -46,8 +46,8 @@ services:
       args:
         <<: *build-base
         phpVersion: "8.3"
-        phpTarGzUrl: https://www.php.net/distributions/php-8.3.20.tar.gz
-        phpSha256Hash: "515ed37529df6b7f569ba68d505713bce23a93a58471dedac4ecfd17c44e5650"
+        phpTarGzUrl: https://www.php.net/distributions/php-8.3.29.tar.gz
+        phpSha256Hash: "8565fa8733c640b60da5ab4944bf2d4081f859915b39e29b3af26cf23443ed97"
 
   php-8.2:
     image: datadog/dd-trace-ci:php-8.2_bookworm-$BOOKWORM_NEXT_VERSION

tests/Frameworks/Drupal/Version_10_1/composer.json

@@ -22,7 +22,7 @@
         "composer/composer": "^2.4",
         "drupal/coder": "^8.3.10",
         "instaclick/php-webdriver": "^1.4.1",
-        "justinrainbow/json-schema": "^5.2",
+        "justinrainbow/json-schema": "^6.5.1",
         "mglaman/phpstan-drupal": "^1.1.34",
         "mikey179/vfsstream": "^1.6.11",
         "phpspec/prophecy-phpunit": "^2",

tests/Frameworks/Laravel/Latest/composer.json

@@ -9,7 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "laravel/framework": "12.31.1",
+        "laravel/framework": "12.44.0",
         "laravel/tinker": "^2.9"
     },
     "require-dev": {

tests/Frameworks/Laravel/Octane/Latest/composer.json

@@ -10,7 +10,7 @@
     "require": {
         "php": "^8.2",
         "laravel/framework": "^11.0",
-        "laravel/octane": "2.12.3",
+        "laravel/octane": "2.13.3",
         "laravel/tinker": "^2.9"
     },
     "require-dev": {
@@ -67,4 +67,4 @@
     },
     "minimum-stability": "stable",
     "prefer-stable": true
-}
+}

tests/Frameworks/Symfony/Latest/composer.json

@@ -94,4 +94,4 @@
     "require-dev": {
         "symfony/maker-bundle": "^1.49"
     }
-}
+}

tests/Frameworks/Yii/Latest/.bowerrc

@@ -1,3 +1,3 @@
 {
-    "directory" : "vendor/bower-asset"
+    "directory" : "vendor/yidas/yii2-bower-asset/bower"
 }

tests/Frameworks/Yii/Latest/config/console.php

@@ -9,7 +9,7 @@
     'bootstrap' => ['log'],
     'controllerNamespace' => 'app\commands',
     'aliases' => [
-        '@bower' => '@vendor/bower-asset',
+        '@bower' => '@vendor/yidas/yii2-bower-asset/bower',
         '@npm'   => '@vendor/npm-asset',
         '@tests' => '@app/tests',
     ],

tests/Frameworks/Yii/Latest/config/test.php

@@ -9,7 +9,7 @@
     'id' => 'basic-tests',
     'basePath' => dirname(__DIR__),
     'aliases' => [
-        '@bower' => '@vendor/bower-asset',
+        '@bower' => '@vendor/yidas/yii2-bower-asset/bower',
         '@npm'   => '@vendor/npm-asset',
     ],
     'language' => 'en-US',

tests/Frameworks/Yii/Latest/config/web.php

@@ -8,7 +8,7 @@
     'basePath' => dirname(__DIR__),
     'bootstrap' => ['log'],
     'aliases' => [
-        '@bower' => '@vendor/bower-asset',
+        '@bower' => '@vendor/yidas/yii2-bower-asset/bower',
         '@npm'   => '@vendor/npm-asset',
     ],
     'modules' => [

tests/Frameworks/Yii/Version_2_0_49/.bowerrc

@@ -1,3 +1,3 @@
 {
-    "directory" : "vendor/bower-asset"
+    "directory" : "vendor/yidas/yii2-bower-asset/bower"
 }

tests/Frameworks/Yii/Version_2_0_49/config/console.php

@@ -9,7 +9,7 @@
     'bootstrap' => ['log'],
     'controllerNamespace' => 'app\commands',
     'aliases' => [
-        '@bower' => '@vendor/bower-asset',
+        '@bower' => '@vendor/yidas/yii2-bower-asset/bower',
         '@npm'   => '@vendor/npm-asset',
         '@tests' => '@app/tests',
     ],

tests/Frameworks/Yii/Version_2_0_49/config/test.php

@@ -9,7 +9,7 @@
     'id' => 'basic-tests',
     'basePath' => dirname(__DIR__),
     'aliases' => [
-        '@bower' => '@vendor/bower-asset',
+        '@bower' => '@vendor/yidas/yii2-bower-asset/bower',
         '@npm'   => '@vendor/npm-asset',
     ],
     'language' => 'en-US',

tests/Frameworks/Yii/Version_2_0_49/config/web.php

@@ -8,7 +8,7 @@
     'basePath' => dirname(__DIR__),
     'bootstrap' => ['log'],
     'aliases' => [
-        '@bower' => '@vendor/bower-asset',
+        '@bower' => '@vendor/yidas/yii2-bower-asset/bower',
         '@npm'   => '@vendor/npm-asset',
     ],
     'modules' => [

tests/ext/bailout_double_hook_clear.phpt

@@ -1,10 +1,14 @@
 --TEST--
 Bailout during hook END should not cause double-clear of span (internal function)
---SKIPIF--
-<?php if (PHP_VERSION_ID >= 80000) die('skip: PHP 7 only'); ?>
 --FILE--
 <?php
 
+DDTrace\trace_function('array_sum', [
+    'posthook' => function(\DDTrace\SpanData $data, $args, $retval) {
+        echo "Hook 0 END\n";
+    }
+]);
+
 DDTrace\trace_function('array_sum', [
     'prehook' => function (\DDTrace\SpanData $data, $args) {
         echo "HOOK 1 PRE\n";