diff --git a/src/native/Cargo.lock b/src/native/Cargo.lock index 333314e0f7e..5ba2aa07437 100644 --- a/src/native/Cargo.lock +++ b/src/native/Cargo.lock @@ -205,8 +205,8 @@ dependencies = [ [[package]] name = "build_common" -version = "41.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "42.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "cbindgen", "serde", @@ -542,49 +542,10 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8" -[[package]] -name = "datadog-ipc" -version = "0.1.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" -dependencies = [ - "anyhow", - "bincode", - "datadog-ipc-macros", - "futures", - "glibc_version", - "io-lifetimes", - "libc", - "libdd-common", - "libdd-ddsketch", - "libdd-trace-protobuf", - "libdd-trace-stats", - "memfd", - "nix 0.29.0", - "page_size", - "sendfd", - "serde", - "tokio", - "tracing", - "winapi", - "windows-sys 0.48.0", - "zwohash", -] - -[[package]] -name = "datadog-ipc-macros" -version = "0.0.1" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "datadog-live-debugger" version = "0.0.1" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "bytes", @@ -615,7 +576,6 @@ dependencies = [ "base64", "build_common", "bytes", - "datadog-ipc", "datadog-live-debugger", "libc", "libdd-capabilities-impl", @@ -625,6 +585,7 @@ dependencies = [ "libdd-ddsketch", "libdd-ffe", "libdd-http-client", + "libdd-ipc", "libdd-library-config", "libdd-log", "libdd-otel-thread-ctx", @@ -1564,7 +1525,7 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libdd-alloc" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "allocator-api2", "libc", @@ -1574,7 +1535,7 @@ dependencies = [ [[package]] name = "libdd-capabilities" version = "3.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "bytes", @@ -1587,7 +1548,7 @@ dependencies = [ [[package]] name = "libdd-capabilities-impl" version = "4.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "bytes", @@ -1600,8 +1561,8 @@ dependencies = [ [[package]] name = "libdd-common" -version = "5.1.1" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "5.2.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "bytes", @@ -1640,8 +1601,8 @@ dependencies = [ [[package]] name = "libdd-common-ffi" -version = "41.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "42.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "build_common", @@ -1654,8 +1615,8 @@ dependencies = [ [[package]] name = "libdd-crashtracker" -version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "2.0.1" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "blazesym", @@ -1667,6 +1628,7 @@ dependencies = [ "libdd-capabilities", "libdd-capabilities-impl", "libdd-common", + "libdd-gotter", "libdd-libunwind-sys", "libdd-telemetry", "nix 0.29.0", @@ -1689,8 +1651,8 @@ dependencies = [ [[package]] name = "libdd-data-pipeline" -version = "7.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "9.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "arc-swap", @@ -1727,8 +1689,8 @@ dependencies = [ [[package]] name = "libdd-data-pipeline-ffi" -version = "41.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "42.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "build_common", "libdd-capabilities-impl", @@ -1744,16 +1706,16 @@ dependencies = [ [[package]] name = "libdd-ddsketch" -version = "1.1.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "1.1.1" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "prost", ] [[package]] name = "libdd-dogstatsd-client" -version = "4.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "5.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "async-trait", @@ -1769,7 +1731,7 @@ dependencies = [ [[package]] name = "libdd-ffe" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "chrono", "derive_more", @@ -1788,10 +1750,18 @@ dependencies = [ "url", ] +[[package]] +name = "libdd-gotter" +version = "1.1.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" +dependencies = [ + "libc", +] + [[package]] name = "libdd-http-client" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "bytes", "fastrand", @@ -1804,10 +1774,49 @@ dependencies = [ "tokio", ] +[[package]] +name = "libdd-ipc" +version = "1.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" +dependencies = [ + "anyhow", + "bincode", + "futures", + "glibc_version", + "io-lifetimes", + "libc", + "libdd-common", + "libdd-ddsketch", + "libdd-ipc-macros", + "libdd-trace-protobuf", + "libdd-trace-stats", + "memfd", + "nix 0.29.0", + "page_size", + "sendfd", + "serde", + "tokio", + "tracing", + "winapi", + "windows-sys 0.48.0", + "zwohash", +] + +[[package]] +name = "libdd-ipc-macros" +version = "1.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "libdd-library-config" -version = "3.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "4.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "libc", @@ -1824,7 +1833,7 @@ dependencies = [ [[package]] name = "libdd-library-config-ffi" version = "0.0.2" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "build_common", @@ -1836,9 +1845,9 @@ dependencies = [ [[package]] name = "libdd-libunwind-sys" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "227f0e30af5fbb91d1b3768db7997fdd1ded87c44b371663783c4ff3eb686908" +checksum = "cf4d5ce7d99aa9244d4dff12d25faf8ad96793183ed049b20f366ce88cf59e68" dependencies = [ "cc", "libc", @@ -1848,7 +1857,7 @@ dependencies = [ [[package]] name = "libdd-log" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "chrono", "tracing", @@ -1859,12 +1868,12 @@ dependencies = [ [[package]] name = "libdd-otel-thread-ctx" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" [[package]] name = "libdd-otel-thread-ctx-ffi" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "build_common", "libdd-common-ffi", @@ -1874,7 +1883,7 @@ dependencies = [ [[package]] name = "libdd-profiling" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "allocator-api2", "anyhow", @@ -1907,13 +1916,14 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-util", + "zrip", "zstd", ] [[package]] name = "libdd-profiling-ffi" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "allocator-api2", "anyhow", @@ -1938,20 +1948,22 @@ dependencies = [ [[package]] name = "libdd-profiling-protobuf" version = "2.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "prost", ] [[package]] name = "libdd-remote-config" -version = "3.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "4.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "base64", "bytes", + "futures", "futures-util", + "getrandom 0.2.17", "hashbrown 0.15.5", "http", "http-body-util", @@ -1976,8 +1988,8 @@ dependencies = [ [[package]] name = "libdd-shared-runtime" -version = "2.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "3.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "async-trait", "futures", @@ -1993,8 +2005,8 @@ dependencies = [ [[package]] name = "libdd-shared-runtime-ffi" -version = "41.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "42.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "build_common", "libdd-shared-runtime", @@ -2003,8 +2015,8 @@ dependencies = [ [[package]] name = "libdd-telemetry" -version = "6.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "7.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "async-trait", @@ -2035,15 +2047,15 @@ dependencies = [ [[package]] name = "libdd-tinybytes" version = "1.1.2" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "serde", ] [[package]] name = "libdd-trace-normalization" -version = "3.0.1" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "4.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "libdd-trace-protobuf", @@ -2051,8 +2063,8 @@ dependencies = [ [[package]] name = "libdd-trace-obfuscation" -version = "5.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "7.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "fluent-uri", @@ -2067,8 +2079,8 @@ dependencies = [ [[package]] name = "libdd-trace-protobuf" -version = "4.0.1" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "5.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "prost", "serde", @@ -2077,8 +2089,8 @@ dependencies = [ [[package]] name = "libdd-trace-stats" -version = "6.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "8.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "arc-swap", @@ -2106,8 +2118,8 @@ dependencies = [ [[package]] name = "libdd-trace-utils" -version = "10.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "11.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "base64", @@ -2142,8 +2154,8 @@ dependencies = [ [[package]] name = "libdd-tracer-flare" -version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=v41.0.0#3da894a0ec74abea0dfe9a3417919825c56b4e65" +version = "2.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=v42.0.0#64436d5a54191c9a9f2d2691f595370512462015" dependencies = [ "anyhow", "bytes", @@ -4956,6 +4968,41 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "zrip" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "964fe9f1ea10a0d183fc143a7525266cbe16978883dbe304725da34b314c04cf" +dependencies = [ + "zrip-core", + "zrip-decode", + "zrip-encode", +] + +[[package]] +name = "zrip-core" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc201ba56175f86e67cc88bdaf1a7af9c061815c7dde719c7a6a1ed5aaa186b" + +[[package]] +name = "zrip-decode" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038f795e49887bdeaab197fff84c8165644484a98dc3f2354e5df3d2e5f4f978" +dependencies = [ + "zrip-core", +] + +[[package]] +name = "zrip-encode" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3dfdcbb503db2045716492d5ab31cd82f2852d0d93d8edf6a9235653d9da685" +dependencies = [ + "zrip-core", +] + [[package]] name = "zstd" version = "0.13.3" diff --git a/src/native/Cargo.toml b/src/native/Cargo.toml index 0c44deb4222..40a80114afd 100644 --- a/src/native/Cargo.toml +++ b/src/native/Cargo.toml @@ -31,18 +31,18 @@ serde = "1.0" serde_json = "1.0" smallvec = "1" tokio = "1" -libdd-ffe = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0", optional = true, features = ["pyo3"] } -datadog-ipc = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0", features = ["one_way_shm_futex"] } -datadog-live-debugger = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } -libdd-remote-config = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } -libdd-telemetry = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } -libdd-tracer-flare = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } -libdd-crashtracker = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0", optional = true } -libdd-ddsketch = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0", optional = true } -libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } -libdd-log = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } -libdd-capabilities-impl = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } -libdd-data-pipeline = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0", features = [ +libdd-ffe = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0", optional = true, features = ["pyo3"] } +libdd-ipc = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0", features = ["one_way_shm_futex"] } +datadog-live-debugger = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } +libdd-remote-config = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } +libdd-telemetry = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } +libdd-tracer-flare = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } +libdd-crashtracker = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0", optional = true } +libdd-ddsketch = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0", optional = true } +libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } +libdd-log = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } +libdd-capabilities-impl = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } +libdd-data-pipeline = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0", features = [ "stats-obfuscation" ] } # DEV: `hyper-backend` (rather than the default `reqwest-backend`) avoids @@ -50,16 +50,16 @@ libdd-data-pipeline = { git = "https://github.com/DataDog/libdatadog", rev = "v4 # hostnames resolved through custom search/ndots resolv.conf setups (e.g. # Docker Compose/Kubernetes service names via embedded DNS) — it uses the # system resolver instead, like the stdlib http.client this replaces did. -libdd-http-client = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0", default-features = false, features = [ +libdd-http-client = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0", default-features = false, features = [ "https", "hyper-backend", ] } -libdd-shared-runtime = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } -libdd-profiling-ffi = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0", optional = true, features = [ +libdd-shared-runtime = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } +libdd-profiling-ffi = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0", optional = true, features = [ "cbindgen", ] } -libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } +libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } native-proc-macro = { path = "native_proc_macro" } strum = { version = "0.26", default-features = false } percent-encoding = "2.3" @@ -68,8 +68,8 @@ tracing = { version = "0.1", default-features = false } pyo3-ffi = { version = "0.28", optional = true } [target.'cfg(target_os = "linux")'.dependencies] -libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0", features = ["otel-thread-ctx"]} -libdd-otel-thread-ctx = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0" } +libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0", features = ["otel-thread-ctx"]} +libdd-otel-thread-ctx = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0" } libc = "0.2" [target.'cfg(target_os = "macos")'.dependencies] @@ -77,7 +77,7 @@ libc = "0.2" [build-dependencies] pyo3-build-config = "0.28" -build_common = { git = "https://github.com/DataDog/libdatadog", rev = "v41.0.0", features = [ +build_common = { git = "https://github.com/DataDog/libdatadog", rev = "v42.0.0", features = [ "cbindgen", ] } diff --git a/src/native/py_string.rs b/src/native/py_string.rs index 33e28c38574..91724d73b28 100644 --- a/src/native/py_string.rs +++ b/src/native/py_string.rs @@ -233,6 +233,11 @@ impl SpanText for PyBackedString { storage: None, } } + + // Don't call this now. It's not implemented yet. + fn from_owned(_value: String) -> Self { + todo!() + } } #[derive(Clone, Default, Debug, PartialEq, Eq, Hash, Serialize)] diff --git a/src/native/rc_shm.rs b/src/native/rc_shm.rs index 64ba6acf379..0529efffa87 100644 --- a/src/native/rc_shm.rs +++ b/src/native/rc_shm.rs @@ -19,8 +19,8 @@ use std::collections::{HashMap, HashSet}; use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::Arc; -use datadog_ipc::one_way_shared_memory::{create_anon_pair, OneWayShmReader, OneWayShmWriter}; -use datadog_ipc::platform::{FileBackedHandle, MappedMem, ShmHandle}; +use libdd_ipc::one_way_shared_memory::{create_anon_pair, OneWayShmReader, OneWayShmWriter}; +use libdd_ipc::platform::{FileBackedHandle, MappedMem, ShmHandle}; use libdd_remote_config::fetch::FileStorage; use libdd_remote_config::file_change_tracker::{FilePath, UpdatedFiles}; use libdd_remote_config::RemoteConfigPath; @@ -513,7 +513,7 @@ impl ShmReader { Err(_) => continue, }; - if !enabled.contains(&parsed.product.to_string()) { + if !enabled.contains(&parsed.product().to_string()) { continue; } diff --git a/src/native/remote_config.rs b/src/native/remote_config.rs index e0d34d52f30..79fccb2af07 100644 --- a/src/native/remote_config.rs +++ b/src/native/remote_config.rs @@ -80,9 +80,9 @@ impl ChangeRecord { pub fn new(path: &RemoteConfigPath, version: u64, content: Option>) -> Self { Self { path: path.to_string(), - product: RemoteConfigProduct(path.product), - config_id: path.config_id.clone(), - name: path.name.clone(), + product: RemoteConfigProduct(path.product()), + config_id: path.config_id().to_owned(), + name: path.name().to_owned(), version, content, } @@ -165,6 +165,7 @@ impl RemoteConfigClient { language: language.unwrap_or_else(|| "python".to_string()), tracer_version, endpoint, + agentless: None, }, products: Vec::new(), capabilities: Vec::new(), @@ -180,7 +181,8 @@ impl RemoteConfigClient { // The fetcher owns the storage; it's reached later via // `fetcher.fetcher.file_storage()`. - let fetcher = SingleChangesFetcher::new( + // `new_no_agentless` is the infallible, synchronous constructor + let fetcher = SingleChangesFetcher::new_no_agentless( ShmStorage::new(), target, runtime_id, @@ -308,7 +310,7 @@ impl RemoteConfigClient { /// The remote config client id (a UUID). Stable for the life of the process. fn get_client_id(&self) -> String { - self.lock().fetcher.get_client_id().clone() + self.lock().fetcher.get_client_id().to_owned() } /// Enable cross-process broadcast: move the storage into shared memory. Must