Skip to content

Commit 877ff44

Browse files
committed
Merge branch 'master' of https://github.com/Datadog/dd-trace-php into bob/windows
Signed-off-by: Bob Weinand <[email protected]>
2 parents 494b753 + d2d9d2f commit 877ff44

File tree

144 files changed

+4689
-1069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+4689
-1069
lines changed

.circleci/continue_config.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ jobs:
12221222
command: |
12231223
export DEBIAN_FRONTEND=noninteractive
12241224
apt update
1225-
apt install -y wget sudo git g++ gcc gcovr cmake make curl libcurl4-gnutls-dev clang clang-tidy clang-format git php-dev php-cgi cargo
1225+
apt install -y wget sudo git g++ gcc gcovr cmake make curl libcurl4-gnutls-dev clang clang-tidy clang-format git php-dev php8.2-xml php-cgi cargo
12261226
- run: git config --global --add safe.directory /home/circleci/datadog/appsec/third_party/libddwaf
12271227
- run:
12281228
name: CMake
@@ -1967,6 +1967,7 @@ jobs:
19671967
DD_TRACE_AGENT_PORT: 80
19681968
DD_TRACE_AGENT_FLUSH_INTERVAL: 1000
19691969
INSTALL_TYPE: << parameters.install_type >>
1970+
RUST_BACKTRACE: 1
19701971
- <<: *IMAGE_DOCKER_REQUEST_REPLAYER
19711972
steps:
19721973
- restore_cache:
@@ -2038,6 +2039,7 @@ jobs:
20382039
VERIFY_APACHE: << parameters.verify_apache >>
20392040
INSTALL_MODE: << parameters.install_mode >>
20402041
INSTALL_TYPE: << parameters.install_type >>
2042+
RUST_BACKTRACE: 1
20412043
- <<: *IMAGE_DOCKER_REQUEST_REPLAYER
20422044
steps:
20432045
- restore_cache:
@@ -2120,6 +2122,8 @@ jobs:
21202122
- run:
21212123
name: Run tests
21222124
command: make -C dockerfiles/verify_packages test_installer
2125+
environment:
2126+
RUST_BACKTRACE: 1
21232127

21242128
randomized_tests:
21252129
working_directory: ~/datadog

.github/workflows/prof_asan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ jobs:
6060
switch-php nts-asan
6161
cd profiling/tests
6262
cp -v $(php-config --prefix)/lib/php/build/run-tests.php .
63-
php run-tests.php --asan -d extension=datadog-profiling.so phpt
63+
php run-tests.php --show-diff --asan -d extension=datadog-profiling.so phpt
6464

0 commit comments

Comments
 (0)