Skip to content

Fix some test failures / flakiness #3376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 2, 2025
Merged

Fix some test failures / flakiness #3376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79fc2dd
test: add debug logs
Leiyks Aug 12, 2025
2c72de4
test: debug sqlsrv integration
Leiyks Aug 25, 2025
8f2caeb
Update composer to version 2
bwoebi Sep 1, 2025
7696dc2
Exclude ext/posix/tests/posix_getgrnam_basic.phpt
bwoebi Sep 1, 2025
b9078c6
Fix flow testsuite
bwoebi Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitlab/generate-tracer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ function before_script_steps() {
stage: test
tags: [ "arch:${ARCH}" ]
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
timeout: 30m
timeout: 60m
variables:
host_os: linux-gnu
COMPOSER_MEMORY_LIMIT: "-1"
Expand Down
22 changes: 11 additions & 11 deletions docker-compose.linux.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ x-aliases:
services:
# --- Alpine ---
'8.0-alpine': { <<: *linux_php_service }
# --- Buster ---
'7.0-buster': { <<: *linux_php_service }
'7.1-buster': { <<: *linux_php_service }
'7.2-buster': { <<: *linux_php_service }
'7.3-buster': { <<: *linux_php_service }
'7.4-buster': { <<: *linux_php_service }
'8.0-buster': { <<: *linux_php_service }
'8.1-buster': { <<: *linux_php_service }
'8.2-buster': { <<: *linux_php_service }
'8.3-buster': { <<: *linux_php_service }
'8.4-buster': { <<: *linux_php_service }
# --- Bookworm ---
'7.0-bookworm': { <<: *linux_php_service }
'7.1-bookworm': { <<: *linux_php_service }
'7.2-bookworm': { <<: *linux_php_service }
'7.3-bookworm': { <<: *linux_php_service }
'7.4-bookworm': { <<: *linux_php_service }
'8.0-bookworm': { <<: *linux_php_service }
'8.1-bookworm': { <<: *linux_php_service }
'8.2-bookworm': { <<: *linux_php_service }
'8.3-bookworm': { <<: *linux_php_service }
'8.4-bookworm': { <<: *linux_php_service }
2 changes: 1 addition & 1 deletion dockerfiles/ci/alpine/php-8.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ RUN set -eux; \
switch-php ${PHP_VERSION}-debug;

# Install Composer
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

COPY welcome /etc/motd

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/ci/bookworm/php-8.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ RUN set -eux; \
switch-php debug;

# Install Composer
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

COPY welcome /etc/motd
RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/ci/bookworm/php-8.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ RUN set -eux; \
switch-php debug;

# Install Composer
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

COPY welcome /etc/motd
RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/ci/buster/php-8.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ RUN set -eux; \
switch-php debug;

# Install Composer
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

COPY welcome /etc/motd
RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/ci/buster/php-8.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ RUN set -eux; \
switch-php debug;

# Install Composer
COPY --from=composer:1 /usr/bin/composer /usr/local/bin/composer
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

COPY welcome /etc/motd
RUN sudo sed -i "s/VERSIONS/$(ls $PHP_INSTALL_DIR | xargs)/" /etc/motd
Expand Down
1 change: 1 addition & 0 deletions dockerfiles/ci/xfail_tests/7.4.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ ext/phar/tests/phar_buildfromiterator8.phpt
ext/phar/tests/phar_oo_002.phpt
ext/phar/tests/phar_oo_005.phpt
ext/phar/tests/phar_oo_007.phpt
ext/posix/tests/posix_getgrnam_basic.phpt
ext/readline/tests/libedit_callback_handler_install_001.phpt
ext/readline/tests/libedit_callback_handler_remove_001.phpt
ext/reflection/tests/009.phpt
Expand Down
2 changes: 2 additions & 0 deletions dockerfiles/ci/xfail_tests/8.0.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ ext/phar/tests/phar_metadata_write4.phpt
ext/phar/tests/phar_oo_002.phpt
ext/phar/tests/phar_oo_005.phpt
ext/phar/tests/phar_oo_007.phpt
ext/posix/tests/posix_getgrnam_basic.phpt
ext/readline/tests/libedit_callback_handler_install_001.phpt
ext/readline/tests/libedit_callback_handler_remove_001.phpt
ext/reflection/tests/009.phpt
Expand Down Expand Up @@ -562,3 +563,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/standard/tests/general_functions/proc_open02.phpt
1 change: 1 addition & 0 deletions dockerfiles/ci/xfail_tests/8.1.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ ext/phar/tests/phar_metadata_write4.phpt
ext/phar/tests/phar_oo_002.phpt
ext/phar/tests/phar_oo_005.phpt
ext/phar/tests/phar_oo_007.phpt
ext/posix/tests/posix_getgrnam_basic.phpt
ext/readline/tests/libedit_callback_handler_install_001.phpt
ext/readline/tests/libedit_callback_handler_remove_001.phpt
ext/simplexml/tests/bug51615.phpt
Expand Down
1 change: 1 addition & 0 deletions dockerfiles/ci/xfail_tests/8.2.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ ext/phar/tests/phar_metadata_write4.phpt
ext/phar/tests/phar_oo_002.phpt
ext/phar/tests/phar_oo_005.phpt
ext/phar/tests/phar_oo_007.phpt
ext/posix/tests/posix_getgrnam_basic.phpt
ext/readline/tests/libedit_callback_handler_install_001.phpt
ext/readline/tests/libedit_callback_handler_remove_001.phpt
ext/simplexml/tests/bug51615.phpt
Expand Down
1 change: 1 addition & 0 deletions dockerfiles/ci/xfail_tests/8.3.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ ext/phar/tests/phar_metadata_write4.phpt
ext/phar/tests/phar_oo_002.phpt
ext/phar/tests/phar_oo_005.phpt
ext/phar/tests/phar_oo_007.phpt
ext/posix/tests/posix_getgrnam_basic.phpt
ext/readline/tests/libedit_callback_handler_install_001.phpt
ext/readline/tests/libedit_callback_handler_remove_001.phpt
ext/simplexml/tests/bug51615.phpt
Expand Down
1 change: 1 addition & 0 deletions dockerfiles/ci/xfail_tests/8.4.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ ext/phar/tests/phar_metadata_write4.phpt
ext/phar/tests/phar_oo_002.phpt
ext/phar/tests/phar_oo_005.phpt
ext/phar/tests/phar_oo_007.phpt
ext/posix/tests/posix_getgrnam_basic.phpt
ext/readline/tests/libedit_callback_handler_install_001.phpt
ext/readline/tests/libedit_callback_handler_remove_001.phpt
ext/simplexml/tests/bug51615.phpt
Expand Down
3 changes: 2 additions & 1 deletion dockerfiles/frameworks/flow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ services:
flow:
depends_on: ['mysql', 'nginx_file_server']
image: 'datadog/dd-trace-ci:php-framework-flow'
environment:
DD_LOGS_INJECTION: "false"
build:
context: contrib
target: flow
Expand All @@ -17,7 +19,6 @@ services:
MYSQL_ROOT_PASSWORD: ""
MYSQL_ALLOW_EMPTY_PASSWORD: 1
MYSQL_ROOT_HOST: "%"
DD_LOGS_INJECTION: "false"
expose: ["3306"]
healthcheck:
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/library_config/fleet_config_overloads_env.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ echo 'DD_ENV: '.dd_trace_env_config("DD_ENV")."\n";
// System INI
echo 'DD_DYNAMIC_INSTRUMENTATION_ENABLED: '.to_str(dd_trace_env_config("DD_DYNAMIC_INSTRUMENTATION_ENABLED"))."\n";

dd_trace_internal_fn("finalize_telemetry");

?>
--EXPECT--
DD_SERVICE: service_from_fleet_config
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/library_config/local_config_does_not_overload_env.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ echo 'DD_ENV: '.dd_trace_env_config("DD_ENV")."\n";
// System INI
echo 'DD_DYNAMIC_INSTRUMENTATION_ENABLED: '.to_str(dd_trace_env_config("DD_DYNAMIC_INSTRUMENTATION_ENABLED"))."\n";

dd_trace_internal_fn("finalize_telemetry");

?>
--EXPECT--
DD_SERVICE: service_from_env
Expand Down
Loading