Skip to content

Commit 64205d3

Browse files
hooliohekumpiunanua
authored
[Versioning] Crashtracker (#1321)
Rename ddtelemetry and ddtelemetry-ffi Fix FFI tests Try to fix package_ffi_on_windows gitlab job Rename ddcommon and ddcommon-ffi windows fix Fix crashtracker cbindgen. Merge branch 'igor/versioning/libdd-telemetry' into igor/versioning/libdd-common fully update the ddcommon and ddcommon-ffi dependencies to reflect the new libdd prefix Merge remote-tracking branch 'origin/main' into igor/versioning/libdd-common Add missing version Rename crashtracker and crashtracker-ffi. Fix compilation. Fix build. Fix lint. Fix tests. Fix workflows. Change libddprog-build branch to execute jobs. Merge remote-tracking branch 'origin/main' into julio/versioning/crashtracker Merge remote-tracking branch 'origin/main' into julio/versioning/crashtracker Merge branch 'main' into julio/versioning/crashtracker Restore data-pipeline-ffi feature of datadog-profiling-ffi Restore data-pipeline-ffi feature of datadog-profiling-ffi Merge remote-tracking branch 'origin/main' into julio/versioning/crashtracker fix libdd-common-ffi import in libdd-telemetry-ffi fix formatting update license file Merge remote-tracking branch 'origin/main' into julio/versioning/crashtracker Merge remote-tracking branch 'origin/main' into julio/versioning/crashtracker Merge remote-tracking branch 'origin/main' into julio/versioning/crashtracker Co-authored-by: ekump <edmund.kump@datadoghq.com> Co-authored-by: iunanua <igor.unanua@datadoghq.com>
1 parent f792fab commit 64205d3

File tree

118 files changed

+331
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+331
-189
lines changed

.github/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ data-pipeline:
5959
crashtracker:
6060
- changed-files:
6161
- any-glob-to-any-file: [
62-
'datadog-crashtracker/**/*',
63-
'datadog-crashtracker-ffi/**/*',
62+
'libdd-crashtracker/**/*',
63+
'libdd-crashtracker-ffi/**/*',
6464
]

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ jobs:
5151
- name: "[${{ steps.rust-version.outputs.version}}] cargo build --workspace --exclude builder --verbose"
5252
shell: bash
5353
run: cargo build --workspace --exclude builder --verbose
54-
- 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::)'"
54+
- 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::)'"
5555
shell: bash
5656
# Run doc tests with cargo test and run tests with nextest and generate junit.xml
57-
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::)'
57+
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::)'
5858
env:
5959
RUST_BACKTRACE: full
60-
- 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::)'"
60+
- 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::)'"
6161
if: runner.os == 'Linux'
6262
shell: bash
63-
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::)'
63+
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::)'
6464
env:
6565
RUST_BACKTRACE: full
6666
- 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::)'"
@@ -225,8 +225,8 @@ jobs:
225225
rust_version: cross-centos7
226226
- run: cargo install cross || true
227227
- run: cross build --workspace --target x86_64-unknown-linux-gnu --exclude builder
228-
- 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::"
229-
- 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::"
228+
- 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::"
229+
- 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::"
230230

231231
ffi_bake:
232232
strategy:

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ variables:
22
# These are gitlab variables so that it's easier to do a manual deploy
33
# If these are set witih value and description, then it gives you UI elements
44
DOWNSTREAM_BRANCH:
5-
value: "main"
5+
value: "julio/versioning/fix-crashtracker-feature"
66
description: "downstream jobs are triggered on this branch"
77

88
include:

Cargo.lock

Lines changed: 58 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
members = [
66
"builder",
77
"libdd-alloc",
8-
"datadog-crashtracker",
9-
"datadog-crashtracker-ffi",
8+
"libdd-crashtracker",
9+
"libdd-crashtracker-ffi",
1010
"datadog-ffe",
1111
"datadog-ffe-ffi",
1212
"datadog-ipc",

LICENSE-3rdparty.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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
1+
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
22
third_party_libraries:
33
- package_name: addr2line
44
package_version: 0.24.2
@@ -27693,9 +27693,9 @@ third_party_libraries:
2769327693
- package_name: stringmetrics
2769427694
package_version: 2.2.2
2769527695
repository: https://github.com/pluots/stringmetrics
27696-
license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-1949cf8c6b5b557f/stringmetrics-2.2.2/LICENSE)
27696+
license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
2769727697
licenses:
27698-
- license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-1949cf8c6b5b557f/stringmetrics-2.2.2/LICENSE)
27698+
- license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
2769927699
text: |
2770027700
Copyright 2022 Trevor Gross
2770127701

benchmark/run_benchmarks_ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pushd "${PROJECT_DIR}" > /dev/null
2222

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

2828
# Copy the benchmark results to the output directory

bin_tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ once_cell = "1.18"
1313
anyhow = "1.0"
1414
current_platform = "0.2.0"
1515
datadog-profiling = { path = "../datadog-profiling" }
16-
datadog-crashtracker = { path = "../datadog-crashtracker" }
16+
libdd-crashtracker = { path = "../libdd-crashtracker" }
1717
libdd-common = { path = "../libdd-common" }
1818
tempfile = "3.3"
1919
serde_json = { version = "1.0" }

bin_tests/src/bin/crashing_test_app.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ mod unix {
1616
use std::env;
1717
use std::time::Duration;
1818

19-
use datadog_crashtracker::{
19+
use libdd_common::{tag, Endpoint};
20+
use libdd_crashtracker::{
2021
self as crashtracker, CrashtrackerConfiguration, CrashtrackerReceiverConfig, Metadata,
2122
};
22-
use libdd_common::{tag, Endpoint};
2323

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

bin_tests/src/bin/crashtracker_bin_test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ mod unix {
2121
use std::path::Path;
2222
use std::time::Duration;
2323

24-
use datadog_crashtracker::{
24+
use libdd_common::{tag, Endpoint};
25+
use libdd_crashtracker::{
2526
self as crashtracker, CrashtrackerConfiguration, CrashtrackerReceiverConfig, Metadata,
2627
};
27-
use libdd_common::{tag, Endpoint};
2828

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

0 commit comments

Comments
 (0)