diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf5eeb9..50d6f09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: crate: '${{ matrix.crate }}' build: - uses: Datadog/action-prebuildify/.github/workflows/build.yml@main + uses: Datadog/action-prebuildify/.github/workflows/build.yml@d4e89247e6dd34f485c0f92c12f0cc739c2f8c92 # main @ 2026-03-16, last known working version needs: build-test-wasm with: package-manager: 'yarn' diff --git a/Cargo.lock b/Cargo.lock index 4ac9981..e9bb693 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -783,6 +783,23 @@ dependencies = [ "prost", ] +[[package]] +name = "libdd-library-config" +version = "1.0.0" +source = "git+https://github.com/DataDog/libdatadog.git?tag=v29.0.0#001bd56fcbba34fa4ec3f9798a6c4fbcddeffa40" +dependencies = [ + "anyhow", + "libdd-trace-protobuf", + "memfd", + "prost", + "rand", + "rmp", + "rmp-serde", + "rustix", + "serde", + "serde_yaml", +] + [[package]] name = "libdd-libunwind-sys" version = "29.0.0" @@ -817,6 +834,16 @@ dependencies = [ "winver", ] +[[package]] +name = "libdd-trace-protobuf" +version = "1.1.0" +source = "git+https://github.com/DataDog/libdatadog.git?tag=v29.0.0#001bd56fcbba34fa4ec3f9798a6c4fbcddeffa40" +dependencies = [ + "prost", + "serde", + "serde_bytes", +] + [[package]] name = "libloading" version = "0.8.9" @@ -1327,7 +1354,7 @@ name = "process-discovery" version = "0.1.0" dependencies = [ "anyhow", - "datadog-library-config", + "libdd-library-config", "napi", "napi-derive", ] @@ -1639,6 +1666,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_bytes" +version = "0.11.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8" +dependencies = [ + "serde", + "serde_core", +] + [[package]] name = "serde_core" version = "1.0.228" diff --git a/crates/process_discovery/Cargo.toml b/crates/process_discovery/Cargo.toml index 1f59cd2..30f94b4 100644 --- a/crates/process_discovery/Cargo.toml +++ b/crates/process_discovery/Cargo.toml @@ -8,7 +8,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] anyhow = "1" -datadog-library-config = { git = "https://github.com/DataDog/libdatadog.git", tag = "v18.1.0" } +libdd-library-config = { git = "https://github.com/DataDog/libdatadog.git", tag = "v29.0.0" } napi = { version = "2" } napi-derive = { version = "2", default-features = false } diff --git a/crates/process_discovery/src/lib.rs b/crates/process_discovery/src/lib.rs index c5cfac1..3649959 100644 --- a/crates/process_discovery/src/lib.rs +++ b/crates/process_discovery/src/lib.rs @@ -1,7 +1,7 @@ use napi::{Error, Status}; use napi_derive::napi; -use datadog_library_config::tracer_metadata; +use libdd_library_config::tracer_metadata; #[napi] pub struct NapiAnonymousFileHandle { @@ -19,6 +19,8 @@ pub struct TracerMetadata { pub service_name: Option, pub service_env: Option, pub service_version: Option, + pub process_tags: Option, + pub container_id: Option, } #[napi] @@ -32,6 +34,8 @@ pub fn store_metadata(data: &TracerMetadata) -> napi::Result