From 5692adc8b049634a08ff00a7471557a005b0ee0d Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Tue, 9 Dec 2025 11:55:47 -0500 Subject: [PATCH 1/2] use published libdatadog crates as dependencies --- Cargo.lock | 52 +++++++++++-------- LICENSE-3rdparty.csv | 2 +- crates/datadog-serverless-compat/Cargo.toml | 2 +- crates/datadog-trace-agent/Cargo.toml | 14 ++--- crates/datadog-trace-agent/src/config.rs | 2 +- .../src/trace_processor.rs | 4 +- 6 files changed, 39 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9713c073..f075a64e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -457,13 +457,13 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "datadog-trace-obfuscation", "duplicate", "http-body-util", "hyper", "hyper-http-proxy", "hyper-util", "libdd-common", + "libdd-trace-obfuscation", "libdd-trace-protobuf", "libdd-trace-utils", "rmp-serde", @@ -475,23 +475,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "datadog-trace-obfuscation" -version = "24.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=6e559d75fd184d5cc46c0caf8b78c2b31a36af5e#6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" -dependencies = [ - "anyhow", - "libdd-common", - "libdd-trace-protobuf", - "libdd-trace-utils", - "log", - "percent-encoding", - "regex", - "serde", - "serde_json", - "url", -] - [[package]] name = "ddsketch-agent" version = "0.1.0" @@ -1292,7 +1275,8 @@ checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libdd-common" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=6e559d75fd184d5cc46c0caf8b78c2b31a36af5e#6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee58537655793508cc5282ecf1507f15a8fa4616a08c728e01a29ee2f035e8fa" dependencies = [ "anyhow", "cc", @@ -1325,7 +1309,8 @@ dependencies = [ [[package]] name = "libdd-tinybytes" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=6e559d75fd184d5cc46c0caf8b78c2b31a36af5e#6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a046c137739f404448bf5afa25eb07662e572da4371f5148860c83b570fd6d9" dependencies = [ "serde", ] @@ -1333,16 +1318,36 @@ dependencies = [ [[package]] name = "libdd-trace-normalization" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=6e559d75fd184d5cc46c0caf8b78c2b31a36af5e#6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5bea58cf904bc80045756012b20d2ce9b15480881be47d5fedabdf5a11601a9" dependencies = [ "anyhow", "libdd-trace-protobuf", ] +[[package]] +name = "libdd-trace-obfuscation" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c48a8dd85019f39a606af89e4c121c189b3f29d620b0ea69f8ae2b44e362553" +dependencies = [ + "anyhow", + "libdd-common", + "libdd-trace-protobuf", + "libdd-trace-utils", + "log", + "percent-encoding", + "regex", + "serde", + "serde_json", + "url", +] + [[package]] name = "libdd-trace-protobuf" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=6e559d75fd184d5cc46c0caf8b78c2b31a36af5e#6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68085a63d80632644b2135c2102aa2d266103766fe7263911cce7536e07b42f" dependencies = [ "prost", "serde", @@ -1352,7 +1357,8 @@ dependencies = [ [[package]] name = "libdd-trace-utils" version = "1.0.0" -source = "git+https://github.com/DataDog/libdatadog/?rev=6e559d75fd184d5cc46c0caf8b78c2b31a36af5e#6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7c359bdb49981bd769b89d5891dfe821de95e4f82419613365acdd0cf36257" dependencies = [ "anyhow", "bytes", diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 74273011..c531df87 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -39,7 +39,6 @@ crossbeam-utils,https://github.com/crossbeam-rs/crossbeam,MIT OR Apache-2.0,The crypto-common,https://github.com/RustCrypto/traits,MIT OR Apache-2.0,RustCrypto Developers dashmap,https://github.com/xacrimon/dashmap,MIT,Acrimon datadog-protos,https://github.com/DataDog/saluki,Apache-2.0,The datadog-protos Authors -datadog-trace-obfuscation,https://github.com/DataDog/libdatadog,Apache-2.0,David Lee ddsketch-agent,https://github.com/DataDog/saluki,Apache-2.0,The ddsketch-agent Authors derive_more,https://github.com/JelteF/derive_more,MIT,Jelte Fennema derive_more-impl,https://github.com/JelteF/derive_more,MIT,Jelte Fennema @@ -112,6 +111,7 @@ libc,https://github.com/rust-lang/libc,MIT OR Apache-2.0,The Rust Project Develo libdd-common,https://github.com/DataDog/libdatadog/tree/main/datadog-common,Apache-2.0,The libdd-common Authors libdd-tinybytes,https://github.com/DataDog/libdatadog/tree/main/libdd-tinybytes,Apache-2.0,The libdd-tinybytes Authors libdd-trace-normalization,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-normalization,Apache-2.0,David Lee +libdd-trace-obfuscation,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-obfuscation,Apache-2.0,Datadog Inc. libdd-trace-protobuf,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-protobuf,Apache-2.0,The libdd-trace-protobuf Authors libdd-trace-utils,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-utils,Apache-2.0,The libdd-trace-utils Authors libloading,https://github.com/nagisa/rust_libloading,ISC,Simonas Kazlauskas diff --git a/crates/datadog-serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml index cac9b6f4..ab7684bc 100644 --- a/crates/datadog-serverless-compat/Cargo.toml +++ b/crates/datadog-serverless-compat/Cargo.toml @@ -7,7 +7,7 @@ description = "Binary to run trace-agent and dogstatsd servers in Serverless env [dependencies] datadog-trace-agent = { path = "../datadog-trace-agent" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" } +libdd-trace-utils = { version = "1.0.0" } 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 149a0e13..b37ac42e 100644 --- a/crates/datadog-trace-agent/Cargo.toml +++ b/crates/datadog-trace-agent/Cargo.toml @@ -20,18 +20,14 @@ async-trait = "0.1.64" tracing = { version = "0.1", default-features = false } serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0" -libdd-common = { git = "https://github.com/DataDog/libdatadog/", rev = "6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" } -libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "6e559d75fd184d5cc46c0caf8b78c2b31a36af5e", features = [ - "mini_agent", -] } -datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog/", rev = "6e559d75fd184d5cc46c0caf8b78c2b31a36af5e" } +libdd-common = { version = "1.0.0" } +libdd-trace-obfuscation = { version = "1.0.0" } +libdd-trace-protobuf = { version = "1.0.0" } +libdd-trace-utils = { version = "1.0.0", features = ["mini_agent"] } [dev-dependencies] rmp-serde = "1.1.1" serial_test = "2.0.0" duplicate = "0.4.1" tempfile = "3.3.0" -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "6e559d75fd184d5cc46c0caf8b78c2b31a36af5e", features = [ - "test-utils", -] } +libdd-trace-utils = { version = "1.0.0", features = ["test-utils"] } diff --git a/crates/datadog-trace-agent/src/config.rs b/crates/datadog-trace-agent/src/config.rs index 13dfd8a3..e6ac5408 100644 --- a/crates/datadog-trace-agent/src/config.rs +++ b/crates/datadog-trace-agent/src/config.rs @@ -8,7 +8,7 @@ use std::env; use std::str::FromStr; use std::sync::OnceLock; -use datadog_trace_obfuscation::obfuscation_config; +use libdd_trace_obfuscation::obfuscation_config; use libdd_trace_utils::config_utils::{ read_cloud_env, trace_intake_url, trace_intake_url_prefixed, trace_stats_url, trace_stats_url_prefixed, diff --git a/crates/datadog-trace-agent/src/trace_processor.rs b/crates/datadog-trace-agent/src/trace_processor.rs index a226f0bb..6effedaf 100644 --- a/crates/datadog-trace-agent/src/trace_processor.rs +++ b/crates/datadog-trace-agent/src/trace_processor.rs @@ -9,7 +9,7 @@ use libdd_common::hyper_migration; use tokio::sync::mpsc::Sender; use tracing::debug; -use datadog_trace_obfuscation::obfuscate::obfuscate_span; +use libdd_trace_obfuscation::obfuscate::obfuscate_span; use libdd_trace_protobuf::pb; use libdd_trace_utils::trace_utils::{self}; use libdd_trace_utils::trace_utils::{EnvironmentType, SendData}; @@ -158,7 +158,7 @@ impl TraceProcessor for ServerlessTraceProcessor { #[cfg(test)] mod tests { - use datadog_trace_obfuscation::obfuscation_config::ObfuscationConfig; + use libdd_trace_obfuscation::obfuscation_config::ObfuscationConfig; use hyper::Request; use std::{collections::HashMap, sync::Arc, time::UNIX_EPOCH}; use tokio::sync::mpsc::{self, Receiver, Sender}; From 9b59f9206c7ef3fd106ad7c8cefbcdbe08ccc2dd Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Tue, 9 Dec 2025 16:28:53 -0500 Subject: [PATCH 2/2] apply formatting --- crates/datadog-trace-agent/src/trace_processor.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/datadog-trace-agent/src/trace_processor.rs b/crates/datadog-trace-agent/src/trace_processor.rs index 6effedaf..96f27580 100644 --- a/crates/datadog-trace-agent/src/trace_processor.rs +++ b/crates/datadog-trace-agent/src/trace_processor.rs @@ -158,8 +158,8 @@ impl TraceProcessor for ServerlessTraceProcessor { #[cfg(test)] mod tests { - use libdd_trace_obfuscation::obfuscation_config::ObfuscationConfig; use hyper::Request; + use libdd_trace_obfuscation::obfuscation_config::ObfuscationConfig; use std::{collections::HashMap, sync::Arc, time::UNIX_EPOCH}; use tokio::sync::mpsc::{self, Receiver, Sender};