Skip to content

Commit 7978fce

Browse files
hooliohekumpiunanua
authored
[Versioning] Rename datadog-profiling crates (#1325)
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. Rename datadog-profiling crates. Fix build. Fix lint. Fix fuzz workflow. Fix Dockerfile. Fix LICENSES. Fix windows release 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 branch 'julio/versioning/crashtracker' into julio/versioning/profiling Remove package aliases clean up 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 branch 'julio/versioning/crashtracker' into julio/versioning/profiling Merge remote-tracking branch 'origin/main' into julio/versioning/profiling Fix test to use profiling-ffi version. Co-authored-by: ekump <edmund.kump@datadoghq.com> Co-authored-by: iunanua <igor.unanua@datadoghq.com> Co-authored-by: julio.gonzalez <julio.gonzalez@datadoghq.com>
1 parent 64205d3 commit 7978fce

Some content is hidden

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

78 files changed

+288
-158
lines changed

.github/workflows/fuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
directory: [libdd-alloc, datadog-profiling, libdd-common-ffi, libdd-trace-utils]
10+
directory: [libdd-alloc, libdd-profiling, libdd-common-ffi, libdd-trace-utils]
1111
env:
1212
CARGO_TERM_COLOR: always
1313
steps:

Cargo.lock

Lines changed: 59 additions & 59 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
@@ -15,8 +15,8 @@ members = [
1515
"libdd-library-config-ffi",
1616
"datadog-live-debugger",
1717
"datadog-live-debugger-ffi",
18-
"datadog-profiling",
19-
"datadog-profiling-ffi",
18+
"libdd-profiling",
19+
"libdd-profiling-ffi",
2020
"libdd-profiling-protobuf",
2121
"datadog-profiling-replayer",
2222
"datadog-remote-config",

LICENSE-3rdparty.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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
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, libdd-profiling, libdd-profiling-protobuf, libdd-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

bin_tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edition = "2021"
1212
once_cell = "1.18"
1313
anyhow = "1.0"
1414
current_platform = "0.2.0"
15-
datadog-profiling = { path = "../datadog-profiling" }
15+
libdd-profiling = { path = "../libdd-profiling" }
1616
libdd-crashtracker = { path = "../libdd-crashtracker" }
1717
libdd-common = { path = "../libdd-common" }
1818
tempfile = "3.3"

bin_tests/src/lib.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,25 @@ use once_cell::sync::OnceCell;
2121
/// item, or a `cargo run` command to be able to locate artifacts built by cargo from the position
2222
/// of the current binary.
2323
24-
#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)]
24+
#[derive(Debug, Default, PartialEq, Eq, Hash, Clone, Copy)]
2525
pub enum ArtifactType {
26+
#[default]
2627
ExecutablePackage,
2728
CDylib,
2829
Bin,
2930
}
3031

31-
#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)]
32+
#[derive(Debug, Default, PartialEq, Eq, Hash, Clone, Copy)]
3233
pub enum BuildProfile {
34+
#[default]
3335
Debug,
3436
Release,
3537
}
3638

37-
#[derive(Debug, PartialEq, Eq, Hash, Clone)]
39+
#[derive(Debug, Default, PartialEq, Eq, Hash, Clone)]
3840
pub struct ArtifactsBuild {
3941
pub name: String,
42+
pub lib_name_override: Option<String>,
4043
pub artifact_type: ArtifactType,
4144
pub build_profile: BuildProfile,
4245
pub triple_target: Option<String>,
@@ -97,13 +100,16 @@ fn inner_build_artifact(c: &ArtifactsBuild) -> anyhow::Result<PathBuf> {
97100
ArtifactType::ExecutablePackage | ArtifactType::Bin => artifact_path.push(&c.name),
98101
ArtifactType::CDylib => {
99102
let name = "lib".to_owned()
100-
+ &c.name.replace('-', "_")
103+
+ c.lib_name_override
104+
.as_deref()
105+
.unwrap_or(&c.name.replace('-', "_"))
101106
+ "."
102107
+ shared_lib_extension(
103108
c.triple_target
104109
.as_deref()
105110
.unwrap_or(current_platform::CURRENT_PLATFORM),
106111
)?;
112+
println!("NAME: {}", name);
107113
artifact_path.push(name);
108114
}
109115
};

bin_tests/tests/crashtracker_bin_test.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ fn test_crash_tracking_callstack() {
198198
build_profile: BuildProfile::Debug,
199199
artifact_type: ArtifactType::Bin,
200200
triple_target: None,
201+
..Default::default()
201202
};
202203

203204
let fixtures = setup_test_fixtures(&[&crashtracker_receiver, &crashing_app]);
@@ -1412,12 +1413,14 @@ fn setup_crashtracking_crates(
14121413
build_profile: crash_tracking_receiver_profile,
14131414
artifact_type: ArtifactType::Bin,
14141415
triple_target: None,
1416+
..Default::default()
14151417
};
14161418
let crashtracker_receiver = ArtifactsBuild {
14171419
name: "test_crashtracker_receiver".to_owned(),
14181420
build_profile: crash_tracking_receiver_profile,
14191421
artifact_type: ArtifactType::Bin,
14201422
triple_target: None,
1423+
..Default::default()
14211424
};
14221425
(crashtracker_bin, crashtracker_receiver)
14231426
}

bin_tests/tests/test_the_tests.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ fn test_the_tests_inner(profile: BuildProfile) {
2525
build_profile: profile,
2626
artifact_type: ArtifactType::Bin,
2727
triple_target: None,
28+
..Default::default()
2829
};
2930
let crates = &[
3031
&ArtifactsBuild {
31-
name: "datadog-profiling-ffi".to_owned(),
32+
name: "libdd-profiling-ffi".to_owned(),
33+
lib_name_override: Some("datadog_profiling_ffi".to_owned()),
3234
build_profile: profile,
3335
artifact_type: ArtifactType::CDylib,
3436
triple_target: None,

builder/src/profiling.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::process::Command;
1414
use std::rc::Rc;
1515
use tools::headers::dedup_headers;
1616

17-
const CRATE_FOLDER: &str = "datadog-profiling-ffi";
17+
const CRATE_FOLDER: &str = "libdd-profiling-ffi";
1818

1919
#[derive(Deserialize)]
2020
struct CargoFile {

datadog-profiling-ffi/README.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)