Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
8221b6f
Update libdatadog
bwoebi Mar 7, 2026
44e6296
build(profiling): update libdatadog to v29
morrisonlevi Mar 11, 2026
8da8ee0
Merge branch 'master' into bob/libdd-update
morrisonlevi Mar 12, 2026
a20115f
Add configurable size
bwoebi Mar 12, 2026
e4b7839
Update for new metrics stuff
bwoebi Mar 13, 2026
9f4bde6
Make this Makefile more cleverer
bwoebi Mar 13, 2026
99afb63
Update
bwoebi Mar 13, 2026
e28161a
Fixup windows
bwoebi Mar 16, 2026
aad0640
Fix test
bwoebi Mar 16, 2026
229905a
Update libdatadog
bwoebi Mar 16, 2026
992785f
Add automake
bwoebi Mar 17, 2026
ea81281
Include Pid in error log messages
bwoebi Mar 17, 2026
6e0c3c8
Fix parallel build
bwoebi Mar 17, 2026
d56bc0e
And add libtool
bwoebi Mar 17, 2026
b721136
Rename $NIGHTLY to $NIGHTLY_BUILD
bwoebi Mar 17, 2026
fc3c1ee
Fix warning
bwoebi Mar 19, 2026
a32e4f5
Merge branch 'master' of github.com:DataDog/dd-trace-php into bob/lib…
bwoebi Mar 20, 2026
e04172d
Update libdatadog
bwoebi Mar 20, 2026
7bd94d1
Fix test
bwoebi Mar 20, 2026
18866ab
Fix windows tests
bwoebi Mar 20, 2026
3b2ab33
Reorder cleanup
bwoebi Mar 20, 2026
6c39479
Update lockfile
bwoebi Mar 21, 2026
ff791d6
Bleh we need a newer libtool than PHPs
bwoebi Mar 21, 2026
8d713c4
Merge branch 'master' of github.com:DataDog/dd-trace-php into bob/lib…
bwoebi Mar 21, 2026
ae57131
Keep the library thread alive as long as necessary
bwoebi Mar 21, 2026
4069213
Avoid auto-retries in telemetry tests
bwoebi Mar 21, 2026
5d08aec
Fix loader compilation
bwoebi Mar 21, 2026
05dd5ba
Fix crash when reconnecting in background sender thread
bwoebi Mar 21, 2026
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-package.php
Original file line number Diff line number Diff line change
Expand Up @@ -1433,7 +1433,7 @@
image: registry.ddbuild.io/ci/libdatadog-build/ci_docker_base:67145216
tags: [ "arch:amd64", "size:large" ]
rules:
- if: $CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY
- if: $CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY_BUILD
when: on_success
- if: $CI_COMMIT_REF_NAME =~ /^ddtrace-/
when: on_success
Expand Down
8 changes: 4 additions & 4 deletions .gitlab/generate-tracer.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,17 @@ function before_script_steps($with_docker_auth = false) {
docker exec ${CONTAINER_NAME} powershell.exe "cd app; switch-php nts; C:\php\SDK\phpize.bat; .\configure.bat --enable-debug-pack; nmake"

# Set test environment variables
docker exec ${CONTAINER_NAME} powershell.exe "setx DD_AUTOLOAD_NO_COMPILE true; setx DATADOG_HAVE_DEV_ENV 1; setx DD_TRACE_GIT_METADATA_ENABLED 0"
docker exec ${CONTAINER_NAME} powershell.exe "setx DD_AUTOLOAD_NO_COMPILE true; setx DATADOG_HAVE_DEV_ENV 1; setx DD_TRACE_GIT_METADATA_ENABLED 0; setx DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED 0"

# Run extension tests
docker exec ${CONTAINER_NAME} powershell.exe 'cd app; $env:_DD_DEBUG_SIDECAR_LOG_LEVEL=trace; $env:_DD_DEBUG_SIDECAR_LOG_METHOD="""file://${pwd}\sidecar.log"""; C:\php\php.exe -n -d memory_limit=-1 -d output_buffering=0 run-tests.php -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --show-diff -p C:\php\php.exe -d "extension=${pwd}\x64\Release\php_ddtrace.dll" "${pwd}\tests\ext"'

# Try to stop the container, don't care if we fail
try { docker stop -t 5 ${CONTAINER_NAME} } catch { }
after_script:
- |
docker exec ${CONTAINER_NAME} cmd.exe /s /c xcopy /y /c /s /e C:\ProgramData\Microsoft\Windows\WER\ReportQueue .\app\dumps\
exit 0
- |
# Try to stop the container, don't care if we fail
try { docker stop -t 5 ${CONTAINER_NAME} } catch { }
- 'powershell -NoProfile -Command "try { docker logs request-replayer } catch {}"'
- 'powershell -NoProfile -Command "try { docker logs httpbin-integration } catch {}"'
- 'powershell -NoProfile -Command "try { docker stop -t 15 request-replayer } catch {}"'
Expand Down
Loading
Loading