Move cc_utils code to ddcommon

Cargo.toml

@@ -33,7 +33,6 @@ members = [
   "ddtelemetry",
   "ddtelemetry-ffi",
   "tools",
-  "tools/cc_utils",
   "tools/sidecar_mockgen",
   "spawn_worker",
   "tests/spawn_from_lib",

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

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" }

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")

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]

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 = [

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)

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/"