Fixup core dumping in CI

Signed-off-by: Bob Weinand <[email protected]>
DataDog · Feb 19, 2025 · 77815a2 · 77815a2
1 parent 06d3f4d
commit 77815a2
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 14 deletions.
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -978,7 +978,7 @@ jobs:
       - run:
           command: |
             mkdir -p /tmp/artifacts/core_dumps
-            find /tmp -name "core*" -type f | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find /tmp -name "core*" -type f | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             ! [ "$(ls -A /tmp/artifacts/core_dumps)" ] || cp tmp/build_extension/modules/ddtrace.so /tmp/artifacts/
             cp -a tmp/build_extension/tests/$(if [[ << parameters.make_target >> == *opcache* ]]; then echo opcache; else echo ext; fi) /tmp/artifacts/tests
           when: on_fail
@@ -1028,7 +1028,7 @@ jobs:
       - run:
           command: |
             mkdir -p /tmp/artifacts/core_dumps
-            find /tmp -name "core*" -type f | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find /tmp -name "core*" -type f | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             ! [ "$(ls -A /tmp/artifacts/core_dumps)" ] || cp tmp/build_extension/modules/ddtrace.so /tmp/artifacts/
             cp -a tmp/build_extension/tests/ext /tmp/artifacts/tests
             find /tmp/artifacts/tests -name '*.phpt' -delete
@@ -1080,7 +1080,7 @@ jobs:
       - run:
           command: |
             mkdir -p /tmp/artifacts/core_dumps
-            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             ! [ "$(ls -A /tmp/artifacts/core_dumps)" ] || cp tmp/build_extension/modules/ddtrace.so /tmp/artifacts/
             cp -a tmp/build_extension/tests/ext /tmp/artifacts/tests
             find /tmp/artifacts/tests -name '*.phpt' -delete
@@ -1179,7 +1179,7 @@ jobs:
       - run:
           command: |
             mkdir -p /tmp/artifacts/core_dumps
-            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             cp -a tmp/build_extension/tests/ext /tmp/artifacts/tests
             find /tmp/artifacts/tests -name '*.phpt' -delete
           when: on_fail
@@ -1303,7 +1303,7 @@ jobs:
       - run:
           command: |
             mkdir -p /tmp/artifacts/core_dumps
-            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             ! [ "$(ls -A /tmp/artifacts/core_dumps)" ] || cp tmp/build_extension/modules/ddtrace.so /tmp/artifacts/
             cp -a tmp/build_extension/tests/ext /tmp/artifacts/tests
           when: on_fail
@@ -1766,7 +1766,7 @@ jobs:
             mkdir -p /tmp/artifacts
             find ~/datadog/tests -type f \( -name 'phpunit_error.log' -o -name 'nginx_*.log' -o -name 'apache_*.log' -o -name 'php_fpm_*.log' -o -name 'dd_php_error.log' -o -name 'sidecar.log' \) -exec cp --parents '{}' /tmp/artifacts \;
             mkdir -p /tmp/artifacts/core_dumps
-            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             ! [ "$(ls -A /tmp/artifacts/core_dumps)" ] || cp tmp/build_extension/modules/ddtrace.so /tmp/artifacts/
           when: on_fail
       - run:
@@ -1977,7 +1977,7 @@ jobs:
           command: |
             cd /usr/local/src/php
             mkdir -p /tmp/artifacts/core_dumps
-            find ./ -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find ./ -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             mkdir -p /tmp/artifacts/diffs
             find -type f -name '*.diff' -exec cp --parents '{}' /tmp/artifacts/diffs \;
           when: on_fail
@@ -2060,7 +2060,7 @@ jobs:
             mkdir -p /tmp/artifacts
             find ~/datadog/tests -type f \( -name 'phpunit_error.log' -o -name 'nginx_*.log' -o -name 'apache_*.log' -o -name 'php_fpm_*.log' -o -name 'dd_php_error.log' \) -exec cp --parents '{}' /tmp/artifacts \;
             mkdir -p /tmp/artifacts/core_dumps
-            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find /tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             ! [ "$(ls -A /tmp/artifacts/core_dumps)" ] || cp tmp/build_extension/modules/ddtrace.so /tmp/artifacts/
           when: on_fail
       - store_artifacts:
@@ -2135,7 +2135,7 @@ jobs:
       - run:
           command: |
             mkdir -p /tmp/artifacts/core_dumps
-            find tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             ! [ "$(ls -A /tmp/artifacts/core_dumps)" ] || cp tmp/build_extension/modules/ddtrace.so /tmp/artifacts/
             cp -a tmp/build_extension/tests/ext /tmp/artifacts/tests
             find /tmp/artifacts/tests -name '*.phpt' -delete
@@ -2189,7 +2189,7 @@ jobs:
       - run:
           command: |
             mkdir -p /tmp/artifacts/core_dumps
-            find tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps
+            find tmp -name "core.*" | xargs -I % -n 1 cp % /tmp/artifacts/core_dumps && chmod -R o+rx /tmp/artifacts/core_dumps
             ! [ "$(ls -A /tmp/artifacts/core_dumps)" ] || cp tmp/build_extension/modules/ddtrace.so /tmp/artifacts/
             cp -a tmp/build_extension/tests/ext /tmp/artifacts/tests
             find /tmp/artifacts/tests -name '*.phpt' -delete

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components-rs/common.h b/components-rs/common.h
@@ -915,13 +915,22 @@ typedef enum ddog_crasht_OpTypes {
 
 /**
  * See https://man7.org/linux/man-pages/man2/sigaction.2.html
+ * MUST REMAIN IN SYNC WITH THE ENUM IN emit_sigcodes.c
  */
 typedef enum ddog_crasht_SiCodes {
   DDOG_CRASHT_SI_CODES_BUS_ADRALN,
   DDOG_CRASHT_SI_CODES_BUS_ADRERR,
   DDOG_CRASHT_SI_CODES_BUS_MCEERR_AO,
   DDOG_CRASHT_SI_CODES_BUS_MCEERR_AR,
   DDOG_CRASHT_SI_CODES_BUS_OBJERR,
+  DDOG_CRASHT_SI_CODES_ILL_BADSTK,
+  DDOG_CRASHT_SI_CODES_ILL_COPROC,
+  DDOG_CRASHT_SI_CODES_ILL_ILLADR,
+  DDOG_CRASHT_SI_CODES_ILL_ILLOPC,
+  DDOG_CRASHT_SI_CODES_ILL_ILLOPN,
+  DDOG_CRASHT_SI_CODES_ILL_ILLTRP,
+  DDOG_CRASHT_SI_CODES_ILL_PRVOPC,
+  DDOG_CRASHT_SI_CODES_ILL_PRVREG,
   DDOG_CRASHT_SI_CODES_SEGV_ACCERR,
   DDOG_CRASHT_SI_CODES_SEGV_BNDERR,
   DDOG_CRASHT_SI_CODES_SEGV_MAPERR,

diff --git a/libdatadog b/libdatadog
diff --git a/loader/bin/test.sh b/loader/bin/test.sh
@@ -29,7 +29,8 @@ printf "Test load loader\n\n"
 DD_TRACE_DEBUG=1 php -n -d zend_extension=${PWD}/modules/dd_library_loader.so -v
 
 printf "\nRunning PHPT tests\n"
-php -n run-tests.php -q -p $(which php) -n -d zend_extension=${PWD}/modules/dd_library_loader.so --show-diff
+# point extension_dir into nirvana to avoid issues with dl()
+php -n run-tests.php -q -p $(which php) -n -d extension_dir=/dev/shm/ -d zend_extension=${PWD}/modules/dd_library_loader.so --show-diff
 
 printf "\nRunning functional tests\n\n"
 failure=0

diff --git a/tests/ext/background-sender/agent_headers_container_id.phpt b/tests/ext/background-sender/agent_headers_container_id.phpt
@@ -40,7 +40,7 @@ echo 'Done.' . PHP_EOL;
 --EXPECTF--
 [ddtrace] [info] Flushing trace of size 1 to send-queue for http://request-replayer:80
 
-datadog-container-id: 9d5b23edb1ba181e8910389a99906598d69ac9a0ead109ee55730cc416d95f7f
+datadog-container-id:%s9d5b23edb1ba181e8910389a99906598d69ac9a0ead109ee55730cc416d95f7f
 datadog-meta-lang: php
 
 Done.

diff --git a/tests/ext/background-sender/agent_headers_container_id_empty.phpt b/tests/ext/background-sender/agent_headers_container_id_empty.phpt
@@ -11,6 +11,7 @@ DD_TRACE_AGENT_FLUSH_AFTER_N_REQUESTS=1
 DD_TRACE_AGENT_FLUSH_INTERVAL=333
 DD_TRACE_GENERATE_ROOT_SPAN=0
 DD_INSTRUMENTATION_TELEMETRY_ENABLED=0
+DD_TRACE_SIDECAR_TRACE_SENDER=0
 --INI--
 ddtrace.cgroup_file={PWD}/stubs/cgroup.empty
 datadog.trace.agent_test_session_token=background-sender/agent_headers_container_id_empty

diff --git a/tests/ext/background-sender/agent_headers_container_id_fargate.phpt b/tests/ext/background-sender/agent_headers_container_id_fargate.phpt
@@ -39,7 +39,7 @@ echo 'Done.' . PHP_EOL;
 --EXPECTF--
 [ddtrace] [info] Flushing trace of size 1 to send-queue for http://request-replayer:80
 
-datadog-container-id: 34dc0b5e626f2c5c4c5170e34b10e765-1234567890
+datadog-container-id:%s34dc0b5e626f2c5c4c5170e34b10e765-1234567890
 datadog-meta-lang: php
 
 Done.
+14 −0		Cargo.lock
+40 −6		LICENSE-3rdparty.yml
+12 −5		bin_tests/src/bin/crashtracker_bin_test.rs
+134 −45		bin_tests/tests/crashtracker_bin_test.rs
+12 −6		crashtracker/Cargo.toml
+12 −0		crashtracker/build.rs
+3 −6		crashtracker/src/collector/emitters.rs
+121 −0		crashtracker/src/crash_info/emit_sicodes.c
+191 −155		crashtracker/src/crash_info/sig_info.rs
+1 −1		data-pipeline-ffi/src/trace_exporter.rs
+1 −1		data-pipeline/benches/span_concentrator_bench.rs
+1 −1		data-pipeline/src/span_concentrator/aggregation.rs
+1 −1		data-pipeline/src/span_concentrator/mod.rs
+1 −1		data-pipeline/src/span_concentrator/tests.rs
+1 −1		data-pipeline/src/stats_exporter.rs
+1 −1		data-pipeline/src/trace_exporter/error.rs
+3 −3		data-pipeline/src/trace_exporter/mod.rs
+1 −1		ddtelemetry/src/metrics.rs
+1 −1		ddtelemetry/src/worker/mod.rs
+1 −1		remote-config/src/fetch/fetcher.rs
+9 −6		remote-config/src/fetch/multitarget.rs
+1 −1		remote-config/src/fetch/shared.rs
+2 −1		sidecar/src/entry.rs
+1 −1		sidecar/src/log.rs
+1 −1		sidecar/src/service/debugger_diagnostics_bookkeeper.rs
+12 −1		sidecar/src/service/remote_configs.rs
+8 −6		sidecar/src/service/session_info.rs
+18 −19		sidecar/src/service/sidecar_server.rs
+1 −1		sidecar/src/service/telemetry/enqueued_telemetry_stats.rs
+1 −1		sidecar/src/service/tracing/trace_flusher.rs
+12 −5		sidecar/src/shm_remote_config.rs
+5 −1		sidecar/src/watchdog.rs
+1 −1		trace-utils/src/lib.rs
+0 −0		trace-utils/src/msgpack_decoder/decode/error.rs
+88 −0		trace-utils/src/msgpack_decoder/decode/map.rs
+35 −0		trace-utils/src/msgpack_decoder/decode/meta_struct.rs
+27 −0		trace-utils/src/msgpack_decoder/decode/metrics.rs
+10 −0		trace-utils/src/msgpack_decoder/decode/mod.rs
+1 −1		trace-utils/src/msgpack_decoder/decode/number.rs
+5 −5		trace-utils/src/msgpack_decoder/decode/span_link.rs
+97 −0		trace-utils/src/msgpack_decoder/decode/string.rs
+1 −0		trace-utils/src/msgpack_decoder/mod.rs
+0 −855		trace-utils/src/msgpack_decoder/v04/decoder/mod.rs
+650 −3		trace-utils/src/msgpack_decoder/v04/mod.rs
+8 −7		trace-utils/src/msgpack_decoder/v04/span.rs
+4 −0		trace-utils/src/span/mod.rs
+0 −0		trace-utils/src/span/v04/mod.rs
+1 −0		trace-utils/src/span/v04/span.rs
+0 −0		trace-utils/src/span/v04/trace_utils.rs
+1 −1		trace-utils/src/test_utils/mod.rs
+2 −2		trace-utils/src/tracer_payload.rs