test: fix 8.5 language tests

Signed-off-by: Alexandre Rulleau <[email protected]>

Author: Leiyks

.gitlab/generate-tracer.php

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

dockerfiles/ci/centos/7/base.Dockerfile

@@ -172,6 +172,10 @@ ENV PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/lib6
 
 # Caution, takes a very long time! Since we have to build one from source,
 # I picked LLVM 17, which matches Rust 1.76.
+# Ordinarily we leave sources, but LLVM is 2GiB just for the sources...
+# Minimum: libclang. Nice-to-have: full toolchain including linker to play
+# with cross-language link-time optimization. Needs to match rustc -Vv's llvm
+# version.
 RUN source scl_source enable devtoolset-9 \
   && yum install -y python3 \
   && /root/download-src.sh ninja https://github.com/ninja-build/ninja/archive/refs/tags/v1.11.0.tar.gz \
@@ -217,6 +221,7 @@ RUN source scl_source enable devtoolset-7 \
 ARG RUST_VERSION="1.84.1"
 ARG RUST_SHA256_ARM="be89f6ad9b70cc4b25182ae299f94ab047a713a51fddf95284823c8afe4aef85"
 ARG RUST_SHA256_X86="106c89f23ce1c763fcbea8e2714b2ba869bf7af70804813987a4483896398933"
+# Mount a cache into /rust/cargo if you want to pre-fetch packages or something
 ENV CARGO_HOME=/rust/cargo
 ENV RUSTUP_HOME=/rust/rustup
 RUN source scl_source enable devtoolset-7 \

dockerfiles/ci/xfail_tests/8.5.list

@@ -4,9 +4,10 @@ Zend/tests/arginfo_zpp_mismatch_strict.phpt
 Zend/tests/bug63882_2.phpt
 Zend/tests/bug69315.phpt
 Zend/tests/bug70258.phpt
-Zend/tests/bug70805.phpt
-Zend/tests/bug70805_1.phpt
-Zend/tests/bug70805_2.phpt
+Zend/tests/gc/bug70805.phpt
+Zend/tests/gc/bug70805_1.phpt
+Zend/tests/gc/bug70805_2.phpt
+Zend/tests/disable_classes_warning.phpt
 Zend/tests/bug71539_5.phpt
 Zend/tests/bug72038.phpt
 Zend/tests/bug75921.phpt
@@ -18,8 +19,8 @@ Zend/tests/fibers/out-of-memory-in-fiber.phpt
 Zend/tests/fibers/out-of-memory-in-nested-fiber.phpt
 Zend/tests/fibers/out-of-memory-in-recursive-fiber.phpt
 Zend/tests/gc_031.phpt
-Zend/tests/gc_037.phpt
-Zend/tests/gc_045.phpt
+Zend/tests/gc/gc_037.phpt
+Zend/tests/gc/gc_045.phpt
 Zend/tests/get_defined_functions_basic.phpt
 Zend/tests/get_required_files.phpt
 Zend/tests/gh7958.phpt
@@ -217,3 +218,4 @@ ext/standard/tests/http/ghsa-hgf5-96fm-v528-003.phpt
 ext/standard/tests/http/ghsa-hgf5-96fm-v528-002.phpt
 ext/standard/tests/http/ghsa-hgf5-96fm-v528-001.phpt
 ext/standard/tests/http/ignore_errors.phpt
+ext/posix/tests/posix_getgrnam_basic.phpt

dockerfiles/ci/xfail_tests/README.md

@@ -211,3 +211,10 @@ The exact PHP version that a given test checks this env var varies, but these
 are some tests which are skipped for older versions which don't check it:
 
  - `ext/sockets/tests/socket_shutdown.phpt`
+
+## `Zend/tests/disable_classes_warning.phpt`
+
+Disabled on versions: `8.5+`.
+
+PHP 8.5 completely removed the `disable_classes` INI directive (see [RFC](https://wiki.php.net/rfc/remove_disable_classes)).
+

dockerfiles/verify_packages/verify.sh

@@ -3,8 +3,6 @@
 set -e
 
 export DD_REMOTE_CONFIG_ENABLED=false
-export DD_TRACE_DEBUG=1
-export DD_TRACE_LOG_FILE=/tmp/log
 
 # Installing generic dependencies. OS_ID='centos'|'debian'|'alpine'
 OS_ID=$(. /etc/os-release; echo $ID)
@@ -36,24 +34,20 @@ fi
 echo "PHP version: $(${DD_TRACE_PHP_BIN} -v)"
 
 # Script output
-# Explicitly enable CLI tracing and force flush on shutdown for installer-based installations
-# Set high flush interval to prevent premature flush of empty traces before shutdown
-CLI_OUTPUT=$(${DD_TRACE_PHP_BIN} -d datadog.trace.cli_enabled=1 -d datadog.trace.force_flush_on_shutdown=1 -d datadog.trace.agent_flush_interval=999999 /var/www/html/index.php)
+CLI_OUTPUT=$(${DD_TRACE_PHP_BIN} /var/www/html/index.php)
 if [ "${CLI_OUTPUT}" != "hi" ]; then
     echo "Error: expected request output is 'hi'. Actual:\n${APACHE_OUTPUT}"
-    cat /tmp/log
     exit 1
 else
     echo "Request output is correct"
 fi
 
-# Trace exists - increased sleep time for installer-based installations with shutdown flush
-sleep 3
+# Trace exists
+sleep 1
 CLI_TRACES=$(curl -s -L request-replayer/replay)
 # sh compatible way to do string contains
 if [ "${CLI_TRACES#*trace_id}" = "${CLI_TRACES}" ]; then
     echo "Error: traces have not been sent correctly. From request replayer:\n${CLI_TRACES}"
-    cat /tmp/log
     exit 1
 else
     echo "Traces have been sent is correct"
@@ -73,18 +67,17 @@ curl -s -L request-replayer/clear-dumped-data
 NGINX_OUTPUT=$(curl -s -L localhost:8080)
 if [ "${NGINX_OUTPUT}" != "hi" ]; then
     echo "Error: expected request output is 'hi'. Actual:\n${NGINX_OUTPUT}"
-    cat /tmp/log
     exit 1
 else
     echo "Request output is correct"
 fi
 
-sleep 3
+# Trace exists: waiting more than DD_TRACE_AGENT_FLUSH_INTERVAL=1000
+sleep 2
 NGINX_TRACES=$(curl -s -L request-replayer/replay)
 # sh compatible way to do string contains
 if [ "${NGINX_TRACES#*trace_id}" = "${NGINX_TRACES}" ]; then
     echo "Error: traces have not been sent correctly. From request replayer:\n${NGINX_TRACES}"
-    cat /tmp/log
     exit 1
 else
     echo "Traces have been sent is correct"
@@ -105,18 +98,17 @@ if [ "${VERIFY_APACHE:-yes}" != "no" ]; then
     APACHE_OUTPUT=$(curl -s -L localhost:8081/index.php)
     if [ "${APACHE_OUTPUT}" != "hi" ]; then
         echo "Error: expected request output is 'hi'. Actual:\n${APACHE_OUTPUT}"
-        cat /tmp/log
         exit 1
     else
         echo "Request output is correct"
     fi
 
-    sleep 3
+    # Trace exists: waiting more than DD_TRACE_AGENT_FLUSH_INTERVAL=1000
+    sleep 2
     APACHE_TRACES=$(curl -s -L request-replayer/replay)
     # sh compatible way to do string contains
     if [ "${APACHE_TRACES#*trace_id}" = "${APACHE_TRACES}" ]; then
         echo "Error: traces have not been sent correctly. From request replayer:\n${APACHE_TRACES}"
-        cat /tmp/log
         exit 1
     else
         echo "Traces have been sent is correct"

ext/handlers_exception.c

@@ -25,6 +25,10 @@ static zif_handler dd_http_response_code = NULL;
 static zif_handler dd_set_error_handler = NULL;
 static zif_handler dd_set_exception_handler = NULL;
 static zif_handler dd_restore_exception_handler = NULL;
+#if PHP_VERSION_ID >= 80500
+static zif_handler dd_get_error_handler = NULL;
+static zif_handler dd_get_exception_handler = NULL;
+#endif
 
 static void dd_check_exception_in_header(int old_response_code) {
     int new_response_code = SG(sapi_headers).http_response_code;
@@ -197,6 +201,38 @@ static PHP_FUNCTION(ddtrace_restore_exception_handler) {
     }
 }
 
+#if PHP_VERSION_ID >= 80500
+static PHP_FUNCTION(ddtrace_get_error_handler) {
+    dd_get_error_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+
+    // Unwrap the handler if it's our wrapper
+    if (Z_TYPE_P(return_value) == IS_OBJECT && Z_OBJCE_P(return_value) == &dd_exception_or_error_handler_ce) {
+        zval *handler = dd_exception_or_error_handler_handler(Z_OBJ_P(return_value));
+        zval_ptr_dtor(return_value);
+        if (Z_ISUNDEF_P(handler)) {
+            ZVAL_NULL(return_value);
+        } else {
+            ZVAL_COPY(return_value, handler);
+        }
+    }
+}
+
+static PHP_FUNCTION(ddtrace_get_exception_handler) {
+    dd_get_exception_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+
+    // Unwrap the handler if it's our wrapper
+    if (Z_TYPE_P(return_value) == IS_OBJECT && Z_OBJCE_P(return_value) == &dd_exception_or_error_handler_ce) {
+        zval *handler = dd_exception_or_error_handler_handler(Z_OBJ_P(return_value));
+        zval_ptr_dtor(return_value);
+        if (Z_ISUNDEF_P(handler)) {
+            ZVAL_NULL(return_value);
+        } else {
+            ZVAL_COPY(return_value, handler);
+        }
+    }
+}
+#endif
+
 static zend_internal_function ddtrace_exception_or_error_handler;
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ddtrace_exception_or_error_handler, 0, 0, 1)
@@ -497,6 +533,10 @@ void ddtrace_exception_handlers_startup(void) {
         {ZEND_STRL("set_exception_handler"), &dd_set_exception_handler, ZEND_FN(ddtrace_set_exception_handler)},
         {ZEND_STRL("restore_exception_handler"), &dd_restore_exception_handler,
          ZEND_FN(ddtrace_restore_exception_handler)},
+#if PHP_VERSION_ID >= 80500
+        {ZEND_STRL("get_error_handler"), &dd_get_error_handler, ZEND_FN(ddtrace_get_error_handler)},
+        {ZEND_STRL("get_exception_handler"), &dd_get_exception_handler, ZEND_FN(ddtrace_get_exception_handler)},
+#endif
     };
     size_t handlers_len = sizeof handlers / sizeof handlers[0];
     for (size_t i = 0; i < handlers_len; ++i) {