Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ jobs:
CHECKSUM_CMD="shasum -a 256"
EXPECTED_CHECKSUM="071a6140b17438b3f9dd6c65da48b48ea03fc310034fa624ce874fdb6c325da4"
fi

echo "Downloading datadog-ci from $URL"
curl -L --fail --retry 3 -o "$OUTPUT" "$URL"
chmod +x "$OUTPUT"

# Verify checksum
ACTUAL_CHECKSUM=$($CHECKSUM_CMD "$OUTPUT" | cut -d' ' -f1)
echo "Expected checksum: $EXPECTED_CHECKSUM"
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE-3rdparty.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root_name: builder, build_common, tools, libdd-alloc, libdd-crashtracker, libdd-common, libdd-telemetry, libdd-ddsketch, libdd-crashtracker-ffi, libdd-common-ffi, datadog-ffe, datadog-ffe-ffi, datadog-ipc, datadog-ipc-macros, libdd-tinybytes, tarpc, tarpc-plugins, spawn_worker, cc_utils, libdd-library-config, libdd-trace-protobuf, libdd-library-config-ffi, datadog-live-debugger, libdd-data-pipeline, libdd-dogstatsd-client, libdd-trace-stats, libdd-trace-utils, libdd-trace-normalization, libdd-log, datadog-live-debugger-ffi, libdd-profiling, libdd-profiling-protobuf, libdd-profiling-ffi, libdd-data-pipeline-ffi, libdd-ddsketch-ffi, libdd-log-ffi, libdd-telemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, libdd-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib, bin_tests
root_name: builder, build_common, tools, libdd-alloc, libdd-crashtracker, libdd-common, libdd-telemetry, libdd-ddsketch, libdd-libunwind-sys, libdd-crashtracker-ffi, libdd-common-ffi, datadog-ffe, datadog-ffe-ffi, datadog-ipc, datadog-ipc-macros, libdd-tinybytes, tarpc, tarpc-plugins, spawn_worker, cc_utils, libdd-library-config, libdd-trace-protobuf, libdd-library-config-ffi, datadog-live-debugger, libdd-data-pipeline, libdd-dogstatsd-client, libdd-trace-stats, libdd-trace-utils, libdd-trace-normalization, libdd-log, datadog-live-debugger-ffi, libdd-profiling, libdd-profiling-protobuf, libdd-profiling-ffi, libdd-data-pipeline-ffi, libdd-ddsketch-ffi, libdd-log-ffi, libdd-telemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, libdd-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
third_party_libraries:
- package_name: addr2line
package_version: 0.24.2
Expand Down
12 changes: 2 additions & 10 deletions bin_tests/tests/crashtracker_bin_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ fn test_collector_no_allocations_stacktrace_modes() {
("disabled", false),
("without_symbols", false),
("receiver_symbols", false),
("inprocess_symbols", true),
("inprocess_symbols", false),
];

for (env_value, expect_log) in cases {
Expand Down Expand Up @@ -573,20 +573,12 @@ fn test_panic_hook_mode(mode: &str, expected_category: &str, expected_panic_mess
// ====================================================================================
// These tests use `run_custom_crash_test` with the crashing_test_app artifact.

// This test is disabled for now on x86_64 musl
// It seems that on aarch64 musl, libc has CFI which allows
// unwinding passed the signal frame.
// Don't forget to update the ignore condition for this and also
// `test_crash_tracking_callstack` when this is revisited.
#[test]
#[cfg(not(any(all(target_arch = "x86_64", target_env = "musl"))))]
#[cfg_attr(miri, ignore)]
fn test_crasht_tracking_validate_callstack() {
test_crash_tracking_callstack()
}

// This test is disabled for now on x86_64 musl for the reason mentioned above.
#[cfg(not(any(all(target_arch = "x86_64", target_env = "musl"))))]
fn test_crash_tracking_callstack() {
use bin_tests::test_runner::run_custom_crash_test;

Expand Down Expand Up @@ -1128,7 +1120,7 @@ fn assert_telemetry_message(crash_telemetry: &[u8], crash_typ: &str) {
let base_expected_tags: std::collections::HashSet<String> =
std::collections::HashSet::from_iter([
format!("data_schema_version:{current_schema_version}"),
// "incomplete:false", // TODO: re-add after fixing musl unwinding
"incomplete:false".to_string(),
"is_crash:true".to_string(),
"profiler_collecting_sample:1".to_string(),
"profiler_inactive:0".to_string(),
Expand Down
4 changes: 3 additions & 1 deletion libdd-crashtracker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ cxx = ["dep:cxx", "dep:cxx-build"]
# Should be kept in sync with the libdatadog symbolizer crate (also using blasesym)
blazesym = "=0.2.3"

[target.'cfg(target_os = "linux")'.dependencies]
libdd-libunwind-sys = { version = "28.0.2", path = "../libdd-libunwind-sys" }

[dependencies]
anyhow = "1.0"
backtrace = "=0.3.74"
chrono = {version = "0.4", default-features = false, features = ["std", "clock", "serde"]}
cxx = { version = "1.0", optional = true }
libdd-common = { version = "2.0.0", path = "../libdd-common" }
Expand Down
Loading
Loading