Isolate libnative building in a new module so it can be reused from build_standalone.sh

Author: hoolioh

build_libnative.py

@@ -0,0 +1,76 @@
+import argparse
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+def is_installed(bin_file):
+    for path in os.environ.get("PATH", "").split(os.pathsep):
+        if os.path.isfile(os.path.join(path, bin_file)):
+            return True
+
+    return False
+
+def install_dedup_headers():
+    if not is_installed("dedup_headers"):
+        subprocess.run(
+            ["cargo", "install", "--git", "https://github.com/DataDog/libdatadog", "--bin", "dedup_headers", "tools"],
+            check=True,
+            )
+
+
+def build_crate(crate_dir: Path, release: bool, features: list[str] = None):
+    env = os.environ.copy()
+    abs_dir = crate_dir.absolute()
+    env["CARGO_TARGET_DIR"] = str(abs_dir / "target")
+
+    build_cmd = ["cargo", "build"]
+
+    if release:
+        build_cmd.append("--release")
+
+    if features:
+        cmd_features = ', '.join(features)
+        build_cmd += ["--features", cmd_features]
+
+    subprocess.run(
+            build_cmd,
+            cwd=str(crate_dir),
+            check=True,
+            env=env,
+            )
+
+    if 'profiling' in features:
+        install_dedup_headers()
+
+        subprocess.run(
+            ["dedup_headers", "common.h", "crashtracker.h", "profiling.h"],
+            cwd=str(abs_dir / "target" / "include" / "datadog"),
+            check=True,
+        )
+
+def clean_crate(crate_dir: Path):
+    target_dir = crate_dir.absolute() / "target"
+    if target_dir.exists():
+        subprocess.run(
+            ["cargo", "clean"],
+            cwd=str(crate_dir),
+            check=True,
+        )
+
+def main():
+    try:
+        parser = argparse.ArgumentParser(description="Build Rust module")
+        parser.add_argument("--crate", required=True, help="Rust crate location")
+        parser.add_argument("--release", action="store_true", help="Release profile")
+        parser.add_argument("--features", nargs='*', help="List of features")
+
+        args = parser.parse_args()
+
+        build_crate(Path(args.crate), args.release, args.features)
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+if __name__ == "__main__":
+    main()

ddtrace/internal/datadog/profiling/build_standalone.sh

@@ -365,6 +365,12 @@ add_target() {
   esac
 }
 
+#Build rust dependencies
+build_rust() {
+    echo "Building Rust dependencies"
+    python3 ../../../../build_libnative.py --crate ../../../../src/native --release --features profiling
+}
+
 
 ### ENTRYPOINT
 # Check for basic input validity
@@ -383,6 +389,8 @@ print_cmake_args
 
 print_ctest_args
 
+build_rust
+
 # Run cmake
 for target in "${targets[@]}"; do
   run_cmake $target

ddtrace/internal/datadog/profiling/dd_wrapper/CMakeLists.txt

@@ -25,8 +25,6 @@ include(CheckSymbolExists)
 
 # Load libdatadog
 #include(FindLibdatadog)
-#include(FindLibNative)
-#include(FindLibNative)
 find_package(LibNative)
 
 # Set verbose mode so compiler and args are shown

setup.py

@@ -43,6 +43,8 @@
 from urllib.error import HTTPError
 from urllib.request import urlretrieve
 
+from build_libnative import build_crate, clean_crate
+
 
 HERE = Path(__file__).resolve().parent
 
@@ -76,7 +78,6 @@
 CRASHTRACKER_DIR = HERE / "ddtrace" / "internal" / "datadog" / "profiling" / "crashtracker"
 STACK_V2_DIR = HERE / "ddtrace" / "internal" / "datadog" / "profiling" / "stack_v2"
 NATIVE_CRATE = HERE / "src" / "native"
-NATIVE_CRATE_TARGET_DIR = NATIVE_CRATE / "target"
 
 BUILD_PROFILING_NATIVE_TESTS = os.getenv("DD_PROFILING_NATIVE_TESTS", "0").lower() in ("1", "yes", "on", "true")
 
@@ -311,12 +312,7 @@ def remove_artifacts():
 
     @staticmethod
     def remove_rust():
-        if NATIVE_CRATE_TARGET_DIR.exists():
-            subprocess.run(
-                ["cargo", "clean"],
-                cwd=str(NATIVE_CRATE),
-                check=True,
-            )
+        clean_crate(NATIVE_CRATE)
 
     def run(self):
         CleanLibraries.remove_rust()
@@ -333,44 +329,7 @@ def run(self):
 
     def build_rust(self):
 
-        if not self.is_installed("dedup_headers"):
-            subprocess.run(
-                ["cargo", "install", "--git", "https://github.com/DataDog/libdatadog", "--bin", "dedup_headers", "tools"],
-                cwd=str(NATIVE_CRATE),
-                check=True,
-                )
-
-        if not NATIVE_CRATE_TARGET_DIR.exists():
-            dd_include_dir = NATIVE_CRATE_TARGET_DIR / "include" / "datadog"
-            # Setting env var so headers are placed in the proper target directory.
-            env = os.environ.copy()
-            env["CARGO_TARGET_DIR"] = str(NATIVE_CRATE_TARGET_DIR)
-
-            build_cmd = ["cargo", "build", "--release"]
-
-            if native_features:
-                features = ', '.join(native_features)
-                build_cmd += ["--features", features]
-
-            subprocess.run(
-                build_cmd,
-                cwd=str(NATIVE_CRATE),
-                check=True,
-                env=env,
-                )
-
-            subprocess.run(
-                ["dedup_headers", "common.h", "crashtracker.h", "profiling.h"],
-                cwd=str(dd_include_dir),
-                check=True,
-            )
-
-    @staticmethod
-    def is_installed(bin_file):
-        for path in os.environ.get("PATH", "").split(os.pathsep):
-            return os.path.isfile(os.path.join(path, bin_file)
-)
-        return False
+        build_crate(NATIVE_CRATE, True, native_features)
 
     @staticmethod
     def try_strip_symbols(so_file):

src/native/Cargo.toml

@@ -1,6 +1,5 @@
 [package]
 name = "ddtrace-native"
-build = "build/main.rs"
 version = "0.1.0"
 edition = "2021"
 resolver = "2"