diff --git a/Cargo.lock b/Cargo.lock index ca19bceb8d..51ef142f78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -847,14 +847,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cc_utils" -version = "0.1.0" -dependencies = [ - "anyhow", - "cc", -] - [[package]] name = "cexpr" version = "0.6.0" @@ -1360,7 +1352,6 @@ dependencies = [ "backtrace", "blazesym", "cc", - "cc_utils", "chrono", "criterion", "ddcommon", @@ -4696,7 +4687,8 @@ name = "spawn_worker" version = "0.0.1" dependencies = [ "anyhow", - "cc_utils", + "cc", + "ddcommon", "fastrand", "io-lifetimes", "kernel32-sys", diff --git a/Cargo.toml b/Cargo.toml index 7db0650c6f..830dab9e4f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,6 @@ members = [ "ddtelemetry", "ddtelemetry-ffi", "tools", - "tools/cc_utils", "tools/sidecar_mockgen", "spawn_worker", "tests/spawn_from_lib", diff --git a/LICENSE-3rdparty.yml b/LICENSE-3rdparty.yml index 1c5457de32..1e3df37e61 100644 --- a/LICENSE-3rdparty.yml +++ b/LICENSE-3rdparty.yml @@ -1,4 +1,4 @@ -root_name: builder, build_common, tools, datadog-alloc, datadog-crashtracker, ddcommon, ddtelemetry, datadog-ddsketch, cc_utils, datadog-crashtracker-ffi, ddcommon-ffi, datadog-ffe, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, tinybytes, spawn_worker, datadog-library-config, datadog-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, datadog-profiling-protobuf, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-protobuf, datadog-trace-stats, datadog-trace-utils, datadog-trace-normalization, dogstatsd-client, datadog-log, datadog-log-ffi, ddsketch-ffi, ddtelemetry-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, datadog-alloc, datadog-crashtracker, ddcommon, ddtelemetry, datadog-ddsketch, datadog-crashtracker-ffi, ddcommon-ffi, datadog-ffe, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, tinybytes, spawn_worker, datadog-library-config, datadog-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, datadog-profiling-protobuf, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-protobuf, datadog-trace-stats, datadog-trace-utils, datadog-trace-normalization, dogstatsd-client, datadog-log, datadog-log-ffi, ddsketch-ffi, ddtelemetry-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 diff --git a/datadog-crashtracker/Cargo.toml b/datadog-crashtracker/Cargo.toml index fd765a775c..4c906bf46f 100644 --- a/datadog-crashtracker/Cargo.toml +++ b/datadog-crashtracker/Cargo.toml @@ -73,4 +73,4 @@ tempfile = { version = "3.3" } [build-dependencies] # If we use a newer version of cc, CI fails on alpine. cc = "1.1.31" -cc_utils = {path = "../tools/cc_utils"} +ddcommon = { path = "../ddcommon" } diff --git a/datadog-crashtracker/build.rs b/datadog-crashtracker/build.rs index 19ced2bc50..866eadf2cc 100644 --- a/datadog-crashtracker/build.rs +++ b/datadog-crashtracker/build.rs @@ -10,7 +10,7 @@ mod unix_imports { #[cfg(unix)] use unix_imports::*; -pub use cc_utils::cc; +pub use ddcommon::cc_utils::cc; #[cfg(unix)] fn build_shared_libs() { @@ -37,7 +37,7 @@ fn build_c_file() { .expect("Failed to convert dst file path to str"); println!("cargo:rerun-if-changed={}", &dst_file); - cc_utils::ImprovedBuild::new() + ddcommon::cc_utils::ImprovedBuild::new() .file(&src) .link_dynamically("dl") // this is needed for the cross compile (cargo cross) @@ -81,7 +81,7 @@ fn build_cpp_file() { .expect("Failed to convert dst file path to str"); println!("cargo:rerun-if-changed={}", &dst_file); - cc_utils::ImprovedBuild::new() + ddcommon::cc_utils::ImprovedBuild::new() .cpp(true) .file(&src) .link_dynamically("dl") diff --git a/tools/cc_utils/src/lib.rs b/ddcommon/src/cc_utils.rs similarity index 100% rename from tools/cc_utils/src/lib.rs rename to ddcommon/src/cc_utils.rs diff --git a/ddcommon/src/lib.rs b/ddcommon/src/lib.rs index ed07fa4a50..a76c52e88d 100644 --- a/ddcommon/src/lib.rs +++ b/ddcommon/src/lib.rs @@ -16,6 +16,7 @@ use std::sync::{Mutex, MutexGuard}; use std::{borrow::Cow, ops::Deref, path::PathBuf, str::FromStr}; pub mod azure_app_services; +pub mod cc_utils; pub mod connector; pub mod entity_id; #[macro_use] diff --git a/spawn_worker/Cargo.toml b/spawn_worker/Cargo.toml index 0f2ea7f873..850b8bf66a 100644 --- a/spawn_worker/Cargo.toml +++ b/spawn_worker/Cargo.toml @@ -13,7 +13,8 @@ fastrand = "2.0.1" libc = "0.2" [build-dependencies] -cc_utils = {path = "../tools/cc_utils"} +cc = "1.0" +ddcommon = { path = "../ddcommon" } [dependencies.windows] features = [ diff --git a/spawn_worker/build.rs b/spawn_worker/build.rs index 9ecc233a69..af7323017c 100644 --- a/spawn_worker/build.rs +++ b/spawn_worker/build.rs @@ -1,10 +1,10 @@ // Copyright 2021-Present Datadog, Inc. https://www.datadoghq.com/ // SPDX-License-Identifier: Apache-2.0 -pub use cc_utils::cc; +pub use ddcommon::cc_utils::cc; fn main() { - let mut builder = cc_utils::ImprovedBuild::new(); + let mut builder = ddcommon::cc_utils::ImprovedBuild::new(); builder .file("src/trampoline.c") .warnings(true) @@ -28,7 +28,7 @@ fn main() { builder.try_compile_executable("trampoline.bin").unwrap(); if !cfg!(target_os = "windows") { - cc_utils::ImprovedBuild::new() + ddcommon::cc_utils::ImprovedBuild::new() .file("src/ld_preload_trampoline.c") .link_dynamically("dl") .warnings(true) @@ -40,7 +40,7 @@ fn main() { #[cfg(target_os = "windows")] { - cc_utils::ImprovedBuild::new() + ddcommon::cc_utils::ImprovedBuild::new() .file("src/crashtracking_trampoline.cpp") // Path to your C++ file .warnings(true) .warnings_into_errors(true) diff --git a/tools/cc_utils/Cargo.toml b/tools/cc_utils/Cargo.toml deleted file mode 100644 index d58c249b27..0000000000 --- a/tools/cc_utils/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -edition = "2021" -name = "cc_utils" -version = "0.1.0" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -anyhow = {version = "1.0"} -cc = {version = "1.0"} - -[lib] -bench = false - diff --git a/tools/docker/Dockerfile.build b/tools/docker/Dockerfile.build index cb5153c6fa..080afaf09a 100644 --- a/tools/docker/Dockerfile.build +++ b/tools/docker/Dockerfile.build @@ -101,7 +101,6 @@ COPY "datadog-trace-utils/Cargo.toml" "datadog-trace-utils/" COPY "datadog-trace-stats/Cargo.toml" "datadog-trace-stats/" COPY "datadog-tracer-flare/Cargo.toml" "datadog-tracer-flare/" COPY "tools/Cargo.toml" "tools/" -COPY "tools/cc_utils/Cargo.toml" "tools/cc_utils/" COPY "tools/sidecar_mockgen/Cargo.toml" "tools/sidecar_mockgen/" COPY "spawn_worker/Cargo.toml" "spawn_worker/" COPY "tests/spawn_from_lib/Cargo.toml" "tests/spawn_from_lib/"