Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
23e1f95
Rename ddtelemetry and ddtelemetry-ffi
iunanua Nov 6, 2025
1be7086
Fix FFI tests
iunanua Nov 6, 2025
60bdef3
Try to fix package_ffi_on_windows gitlab job
iunanua Nov 6, 2025
70b1c65
Rename ddcommon and ddcommon-ffi
iunanua Nov 6, 2025
c92fa62
windows fix
iunanua Nov 6, 2025
d6fc412
Fix crashtracker cbindgen.
hoolioh Nov 6, 2025
0dbe01f
Merge branch 'igor/versioning/libdd-telemetry' into igor/versioning/l…
iunanua Nov 6, 2025
b049fa1
fully update the ddcommon and ddcommon-ffi dependencies to reflect th…
ekump Nov 6, 2025
3d8ec6c
Merge remote-tracking branch 'origin/main' into igor/versioning/libdd…
ekump Nov 7, 2025
db7b705
Add missing version
iunanua Nov 7, 2025
bff131d
Rename crashtracker and crashtracker-ffi.
hoolioh Nov 7, 2025
6e3b246
Fix compilation.
hoolioh Nov 7, 2025
03cbc65
Fix build.
hoolioh Nov 7, 2025
f488cb3
Fix lint.
hoolioh Nov 7, 2025
400060d
Fix tests.
hoolioh Nov 7, 2025
c2e6af4
Fix workflows.
hoolioh Nov 7, 2025
85be281
Change libddprog-build branch to execute jobs.
hoolioh Nov 7, 2025
ccfeac8
Merge remote-tracking branch 'origin/main' into julio/versioning/cras…
ekump Nov 8, 2025
01e9bef
Merge remote-tracking branch 'origin/main' into julio/versioning/cras…
ekump Nov 8, 2025
d2f02b8
Merge branch 'main' into julio/versioning/crashtracker
iunanua Nov 10, 2025
50a949f
Restore data-pipeline-ffi feature of datadog-profiling-ffi
iunanua Nov 10, 2025
f24fd97
Restore data-pipeline-ffi feature of datadog-profiling-ffi
iunanua Nov 10, 2025
f488932
Merge remote-tracking branch 'origin/main' into julio/versioning/cras…
ekump Nov 10, 2025
991d7f2
fix libdd-common-ffi import in libdd-telemetry-ffi
ekump Nov 10, 2025
6faeab0
fix formatting
ekump Nov 10, 2025
9f42e48
update license file
ekump Nov 10, 2025
d2d1e34
Merge remote-tracking branch 'origin/main' into julio/versioning/cras…
ekump Nov 10, 2025
a3aaf82
Merge remote-tracking branch 'origin/main' into julio/versioning/cras…
ekump Nov 10, 2025
faf4ec6
Merge remote-tracking branch 'origin/main' into julio/versioning/cras…
ekump Nov 10, 2025
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/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ data-pipeline:
crashtracker:
- changed-files:
- any-glob-to-any-file: [
'datadog-crashtracker/**/*',
'datadog-crashtracker-ffi/**/*',
'libdd-crashtracker/**/*',
'libdd-crashtracker-ffi/**/*',
]
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ jobs:
- name: "[${{ steps.rust-version.outputs.version}}] cargo build --workspace --exclude builder --verbose"
shell: bash
run: cargo build --workspace --exclude builder --verbose
- name: "[${{ steps.rust-version.outputs.version}}] cargo nextest run --workspace --features datadog-crashtracker/generate-unit-test-files --exclude builder --profile ci --verbose -E '!test(tracing_integration_tests::)'"
- name: "[${{ steps.rust-version.outputs.version}}] cargo nextest run --workspace --features libdd-crashtracker/generate-unit-test-files --exclude builder --profile ci --verbose -E '!test(tracing_integration_tests::)'"
shell: bash
# Run doc tests with cargo test and run tests with nextest and generate junit.xml
run: cargo test --workspace --features datadog-crashtracker/generate-unit-test-files --exclude builder --doc --verbose && cargo nextest run --workspace --features datadog-crashtracker/generate-unit-test-files --exclude builder --profile ci --verbose -E '!test(tracing_integration_tests::)'
run: cargo test --workspace --features libdd-crashtracker/generate-unit-test-files --exclude builder --doc --verbose && cargo nextest run --workspace --features libdd-crashtracker/generate-unit-test-files --exclude builder --profile ci --verbose -E '!test(tracing_integration_tests::)'
env:
RUST_BACKTRACE: full
- name: "[${{ steps.rust-version.outputs.version}}] Tracing integration tests: cargo nextest run --workspace --features datadog-crashtracker/generate-unit-test-files --exclude builder --profile ci --test-threads=1 --verbose -E 'test(tracing_integration_tests::)'"
- name: "[${{ steps.rust-version.outputs.version}}] Tracing integration tests: cargo nextest run --workspace --features libdd-crashtracker/generate-unit-test-files --exclude builder --profile ci --test-threads=1 --verbose -E 'test(tracing_integration_tests::)'"
if: runner.os == 'Linux'
shell: bash
run: cargo nextest run --workspace --features datadog-crashtracker/generate-unit-test-files --exclude builder --profile ci --test-threads=1 --verbose -E 'test(tracing_integration_tests::)'
run: cargo nextest run --workspace --features libdd-crashtracker/generate-unit-test-files --exclude builder --profile ci --test-threads=1 --verbose -E 'test(tracing_integration_tests::)'
env:
RUST_BACKTRACE: full
- name: "[${{ steps.rust-version.outputs.version}}] RUSTFLAGS=\"-C prefer-dynamic\" cargo nextest run --package test_spawn_from_lib --features prefer-dynamic -E '!test(tracing_integration_tests::)'"
Expand Down Expand Up @@ -225,8 +225,8 @@ jobs:
rust_version: cross-centos7
- run: cargo install cross || true
- run: cross build --workspace --target x86_64-unknown-linux-gnu --exclude builder
- run: cross test --workspace --features datadog-crashtracker/generate-unit-test-files --target x86_64-unknown-linux-gnu --exclude builder -- --skip "::single_threaded_tests::" --skip "tracing_integration_tests::"
- run: cross test --workspace --features datadog-crashtracker/generate-unit-test-files --target x86_64-unknown-linux-gnu --exclude builder --exclude bin_tests -- --skip "::tests::" --skip "::api_tests::" --test-threads 1 --skip "tracing_integration_tests::"
- run: cross test --workspace --features libdd-crashtracker/generate-unit-test-files --target x86_64-unknown-linux-gnu --exclude builder -- --skip "::single_threaded_tests::" --skip "tracing_integration_tests::"
- run: cross test --workspace --features libdd-crashtracker/generate-unit-test-files --target x86_64-unknown-linux-gnu --exclude builder --exclude bin_tests -- --skip "::tests::" --skip "::api_tests::" --test-threads 1 --skip "tracing_integration_tests::"

ffi_bake:
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ variables:
# These are gitlab variables so that it's easier to do a manual deploy
# If these are set witih value and description, then it gives you UI elements
DOWNSTREAM_BRANCH:
value: "main"
value: "julio/versioning/fix-crashtracker-feature"
description: "downstream jobs are triggered on this branch"

include:
Expand Down
116 changes: 58 additions & 58 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
members = [
"builder",
"libdd-alloc",
"datadog-crashtracker",
"datadog-crashtracker-ffi",
"libdd-crashtracker",
"libdd-crashtracker-ffi",
"datadog-ffe",
"datadog-ffe-ffi",
"datadog-ipc",
Expand Down
6 changes: 3 additions & 3 deletions 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, datadog-crashtracker, libdd-common, libdd-telemetry, libdd-ddsketch, datadog-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-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, libdd-profiling-protobuf, datadog-profiling-ffi, libdd-data-pipeline-ffi, libdd-data-pipeline, libdd-dogstatsd-client, libdd-trace-protobuf, libdd-trace-stats, libdd-trace-utils, libdd-trace-normalization, libdd-log, 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, datadog-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
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-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, libdd-profiling-protobuf, datadog-profiling-ffi, libdd-data-pipeline-ffi, libdd-data-pipeline, libdd-dogstatsd-client, libdd-trace-protobuf, libdd-trace-stats, libdd-trace-utils, libdd-trace-normalization, libdd-log, 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, datadog-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
third_party_libraries:
- package_name: addr2line
package_version: 0.24.2
Expand Down Expand Up @@ -27693,9 +27693,9 @@ third_party_libraries:
- package_name: stringmetrics
package_version: 2.2.2
repository: https://github.com/pluots/stringmetrics
license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-1949cf8c6b5b557f/stringmetrics-2.2.2/LICENSE)
license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
licenses:
- license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-1949cf8c6b5b557f/stringmetrics-2.2.2/LICENSE)
- license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
text: |
Copyright 2022 Trevor Gross

Expand Down
2 changes: 1 addition & 1 deletion benchmark/run_benchmarks_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pushd "${PROJECT_DIR}" > /dev/null

# Run benchmarks
message "Running benchmarks"
cargo bench --workspace --features datadog-crashtracker/benchmarking -- --warm-up-time 1 --measurement-time 5 --sample-size=200
cargo bench --workspace --features libdd-crashtracker/benchmarking -- --warm-up-time 1 --measurement-time 5 --sample-size=200
message "Finished running benchmarks"

# Copy the benchmark results to the output directory
Expand Down
2 changes: 1 addition & 1 deletion bin_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ once_cell = "1.18"
anyhow = "1.0"
current_platform = "0.2.0"
datadog-profiling = { path = "../datadog-profiling" }
datadog-crashtracker = { path = "../datadog-crashtracker" }
libdd-crashtracker = { path = "../libdd-crashtracker" }
libdd-common = { path = "../libdd-common" }
tempfile = "3.3"
serde_json = { version = "1.0" }
Expand Down
4 changes: 2 additions & 2 deletions bin_tests/src/bin/crashing_test_app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ mod unix {
use std::env;
use std::time::Duration;

use datadog_crashtracker::{
use libdd_common::{tag, Endpoint};
use libdd_crashtracker::{
self as crashtracker, CrashtrackerConfiguration, CrashtrackerReceiverConfig, Metadata,
};
use libdd_common::{tag, Endpoint};

const TEST_COLLECTOR_TIMEOUT: Duration = Duration::from_secs(10);

Expand Down
4 changes: 2 additions & 2 deletions bin_tests/src/bin/crashtracker_bin_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ mod unix {
use std::path::Path;
use std::time::Duration;

use datadog_crashtracker::{
use libdd_common::{tag, Endpoint};
use libdd_crashtracker::{
self as crashtracker, CrashtrackerConfiguration, CrashtrackerReceiverConfig, Metadata,
};
use libdd_common::{tag, Endpoint};

const TEST_COLLECTOR_TIMEOUT: Duration = Duration::from_secs(10);

Expand Down
2 changes: 1 addition & 1 deletion bin_tests/src/bin/crashtracker_receiver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ fn main() {}

#[cfg(unix)]
fn main() -> anyhow::Result<()> {
datadog_crashtracker::receiver_entry_point_stdin()
libdd_crashtracker::receiver_entry_point_stdin()
}
2 changes: 1 addition & 1 deletion bin_tests/src/modes/behavior.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#![cfg(unix)]
use anyhow::{Context, Result};
use datadog_crashtracker::CrashtrackerConfiguration;
use libdd_crashtracker::CrashtrackerConfiguration;
use std::fs::OpenOptions;
use std::io::Write;
use std::path::Path;
Expand Down
2 changes: 1 addition & 1 deletion bin_tests/src/modes/unix/test_000_donothing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// crashtracker in a fairly normal configuration, generates a crash, and then ensures that the
// crashtracker has recorded the situation as expected.
use crate::modes::behavior::Behavior;
use datadog_crashtracker::CrashtrackerConfiguration;
use libdd_crashtracker::CrashtrackerConfiguration;
use std::path::Path;

pub struct Test;
Expand Down
2 changes: 1 addition & 1 deletion bin_tests/src/modes/unix/test_001_sigpipe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ use crate::modes::behavior::{
set_atomic, trigger_sigpipe,
};

use datadog_crashtracker::CrashtrackerConfiguration;
use libc;
use libdd_crashtracker::CrashtrackerConfiguration;
use std::path::{Path, PathBuf};
use std::sync::atomic::AtomicPtr;

Expand Down
2 changes: 1 addition & 1 deletion bin_tests/src/modes/unix/test_002_sigchld.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ use crate::modes::behavior::{
set_atomic,
};

use datadog_crashtracker::CrashtrackerConfiguration;
use libc;
use libdd_crashtracker::CrashtrackerConfiguration;
use std::path::{Path, PathBuf};
use std::sync::atomic::AtomicPtr;

Expand Down
2 changes: 1 addition & 1 deletion bin_tests/src/modes/unix/test_003_sigchld_with_exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use crate::modes::behavior::{
removeat_permissive, set_atomic,
};

use datadog_crashtracker::CrashtrackerConfiguration;
use libc;
use libdd_crashtracker::CrashtrackerConfiguration;
use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
use std::sync::atomic::AtomicPtr;
Expand Down
2 changes: 1 addition & 1 deletion bin_tests/src/modes/unix/test_004_donothing_sigstack.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
// SPDX-License-Identifier: Apache-2.0
use crate::modes::behavior::Behavior;
use datadog_crashtracker::CrashtrackerConfiguration;
use libdd_crashtracker::CrashtrackerConfiguration;
use std::path::Path;
// This is a simple baseline test that ensures the crashtracker is capable of running on the normal
// stack during a signal (e.g., not using the sigaltstack). Rather than setting any complicated
Expand Down
2 changes: 1 addition & 1 deletion bin_tests/src/modes/unix/test_005_sigpipe_sigstack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use crate::modes::behavior::{
removeat_permissive, set_atomic, trigger_sigpipe,
};

use datadog_crashtracker::CrashtrackerConfiguration;
use libc;
use libdd_crashtracker::CrashtrackerConfiguration;
use std::path::{Path, PathBuf};
use std::sync::atomic::AtomicPtr;

Expand Down
2 changes: 1 addition & 1 deletion bin_tests/src/modes/unix/test_006_sigchld_sigstack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use crate::modes::behavior::{
removeat_permissive, set_atomic,
};

use datadog_crashtracker::CrashtrackerConfiguration;
use libc;
use libdd_crashtracker::CrashtrackerConfiguration;
use std::path::{Path, PathBuf};
use std::sync::atomic::AtomicPtr;

Expand Down
2 changes: 1 addition & 1 deletion bin_tests/src/modes/unix/test_007_chaining.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
use crate::modes::behavior::Behavior;

use crate::modes::behavior::{atom_to_clone, file_append_msg, remove_permissive, set_atomic};
use datadog_crashtracker::CrashtrackerConfiguration;
use libc;
use libdd_crashtracker::CrashtrackerConfiguration;
use nix::sys::signal::{self, SaFlags, SigAction, SigHandler, SigSet};
use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicPtr, Ordering::SeqCst};
Expand Down
Loading
Loading