Skip to content

Commit 27d2a16

Browse files
authored
chore(ci): collect sidecar logs for test jobs (#3864)
Lift sidecar log collection (`_DD_DEBUG_SIDECAR_LOG_LEVEL=trace` and `_DD_DEBUG_SIDECAR_LOG_METHOD=file://${CI_PROJECT_DIR}/artifacts/sidecar.log`) from `.asan_test` and `PHP Language Tests` up into `.base_test` so it also applies to `.debug_test` (test_extension_ci, Unit, API unit, Disabled test_c, Internal api randomized, Opcache, xDebug) and `.cli_integration_test` (web/integration). The existing `artifacts: paths: ["artifacts/"]` with `when: "always"` already uploads the log on every run.
1 parent 29c8781 commit 27d2a16

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

.gitlab/generate-tracer.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ function before_script_steps($with_docker_auth = false) {
204204
DATADOG_HAVE_DEV_ENV: 1
205205
HTTPBIN_HOSTNAME: httpbin-integration
206206
HTTPBIN_PORT: 8080
207+
<?php sidecar_logs(); ?>
207208
before_script:
208209
<?php before_script_steps(true) ?>
209210
- .gitlab/wait-for-service-ready.sh
@@ -213,7 +214,6 @@ function before_script_steps($with_docker_auth = false) {
213214
variables:
214215
SWITCH_PHP_VERSION: debug-zts-asan
215216
ASAN_OPTIONS: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
216-
<?php sidecar_logs(); ?>
217217

218218
<?php
219219
foreach ($asan_minor_major_targets as $major_minor):
@@ -505,7 +505,6 @@ function before_script_steps($with_docker_auth = false) {
505505
<?php if (version_compare($major_minor, "7.2", ">=")): /* too expensive */ ?>
506506
DD_INSTRUMENTATION_TELEMETRY_ENABLED: 0
507507
<?php endif; ?>
508-
<?php sidecar_logs(); ?>
509508
timeout: 40m
510509
retry:
511510
max: 2

0 commit comments

Comments
 (0)