diff --git a/Cargo.lock b/Cargo.lock index 495e57fa..21daa91d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -810,8 +810,8 @@ dependencies = [ [[package]] name = "datadog-trace-normalization" -version = "17.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae#d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" +version = "19.0.1" +source = "git+https://github.com/DataDog/libdatadog/?rev=b708db75c1f21addcd43cf607d0ebf2ff4cfb17f#b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" dependencies = [ "anyhow", "datadog-trace-protobuf", @@ -819,8 +819,8 @@ dependencies = [ [[package]] name = "datadog-trace-obfuscation" -version = "17.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae#d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" +version = "19.0.1" +source = "git+https://github.com/DataDog/libdatadog/?rev=b708db75c1f21addcd43cf607d0ebf2ff4cfb17f#b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" dependencies = [ "anyhow", "datadog-trace-protobuf", @@ -836,8 +836,8 @@ dependencies = [ [[package]] name = "datadog-trace-protobuf" -version = "17.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae#d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" +version = "19.0.1" +source = "git+https://github.com/DataDog/libdatadog/?rev=b708db75c1f21addcd43cf607d0ebf2ff4cfb17f#b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" dependencies = [ "prost", "serde", @@ -846,8 +846,8 @@ dependencies = [ [[package]] name = "datadog-trace-utils" -version = "17.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae#d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" +version = "19.0.1" +source = "git+https://github.com/DataDog/libdatadog/?rev=b708db75c1f21addcd43cf607d0ebf2ff4cfb17f#b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" dependencies = [ "anyhow", "bytes", @@ -862,7 +862,6 @@ dependencies = [ "httpmock", "hyper 1.6.0", "hyper-http-proxy", - "log", "prost", "rand 0.8.5", "rmp", @@ -873,14 +872,15 @@ dependencies = [ "testcontainers", "tinybytes", "tokio", + "tracing", "urlencoding", "zstd", ] [[package]] name = "ddcommon" -version = "17.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae#d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" +version = "19.0.1" +source = "git+https://github.com/DataDog/libdatadog/?rev=b708db75c1f21addcd43cf607d0ebf2ff4cfb17f#b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" dependencies = [ "anyhow", "cc", @@ -896,18 +896,14 @@ dependencies = [ "hyper-rustls", "hyper-util", "libc", - "log", - "memfd", "nix", "pin-project", - "rand 0.8.5", "regex", - "rmp", - "rmp-serde", "rustls", "rustls-native-certs 0.8.1", "serde", "static_assertions", + "thiserror 1.0.69", "tokio", "tokio-rustls", "tower-service", @@ -2198,15 +2194,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memfd" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" -dependencies = [ - "rustix 0.38.44", -] - [[package]] name = "mime" version = "0.3.17" @@ -3689,8 +3676,8 @@ dependencies = [ [[package]] name = "tinybytes" -version = "17.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae#d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" +version = "19.0.1" +source = "git+https://github.com/DataDog/libdatadog/?rev=b708db75c1f21addcd43cf607d0ebf2ff4cfb17f#b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" dependencies = [ "serde", ] diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index bfbd983b..05693d4e 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -165,7 +165,6 @@ log,https://github.com/rust-lang/log,MIT OR Apache-2.0,The Rust Project Develope lru-cache,https://github.com/contain-rs/lru-cache,MIT OR Apache-2.0,Stepan Koltsov matchers,https://github.com/hawkw/matchers,MIT,Eliza Weisman memchr,https://github.com/BurntSushi/memchr,Unlicense OR MIT,"Andrew Gallant , bluss" -memfd,https://github.com/lucab/memfd-rs,MIT OR Apache-2.0,"Luca Bruno , Simonas Kazlauskas " mime,https://github.com/hyperium/mime,MIT OR Apache-2.0,Sean McArthur minimal-lexical,https://github.com/Alexhuszagh/minimal-lexical,MIT OR Apache-2.0,Alex Huszagh miniz_oxide,https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide,MIT OR Zlib OR Apache-2.0,"Frommi , oyvindln , Rich Geldreich richgel99@gmail.com" diff --git a/crates/datadog-serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml index 669f9d3b..f1af5780 100644 --- a/crates/datadog-serverless-compat/Cargo.toml +++ b/crates/datadog-serverless-compat/Cargo.toml @@ -9,8 +9,8 @@ description = "Binary to run trace-agent and dogstatsd servers in Serverless env log = "0.4" env_logger = "0.10.0" datadog-trace-agent = { path = "../datadog-trace-agent" } -datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } -datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } +datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" } +datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" } dogstatsd = { path = "../dogstatsd", default-features = true } tokio = { version = "1", features = ["macros", "rt-multi-thread"]} tokio-util = { version = "0.7", default-features = false } diff --git a/crates/datadog-trace-agent/Cargo.toml b/crates/datadog-trace-agent/Cargo.toml index 98e12fd8..e04e25eb 100644 --- a/crates/datadog-trace-agent/Cargo.toml +++ b/crates/datadog-trace-agent/Cargo.toml @@ -18,15 +18,15 @@ async-trait = "0.1.64" tracing = { version = "0.1", default-features = false } serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0" -ddcommon = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } -datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } -datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae", features = ["mini_agent"] } -datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } -datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } +ddcommon = { git = "https://github.com/DataDog/libdatadog/", rev = "b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" } +datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" } +datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "b708db75c1f21addcd43cf607d0ebf2ff4cfb17f", features = ["mini_agent"] } +datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog/", rev = "b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" } +datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog/", rev = "b708db75c1f21addcd43cf607d0ebf2ff4cfb17f" } [dev-dependencies] rmp-serde = "1.1.1" serial_test = "2.0.0" duplicate = "0.4.1" tempfile = "3.3.0" -datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae", features=["test-utils"] } +datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "b708db75c1f21addcd43cf607d0ebf2ff4cfb17f", features=["test-utils"] }