diff --git a/Cargo.lock b/Cargo.lock index 9a49068c..5255a8de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -567,9 +567,11 @@ dependencies = [ "hyper-util", "libdd-capabilities", "libdd-capabilities-impl", - "libdd-common 3.0.2", + "libdd-common 4.0.0", + "libdd-library-config", "libdd-trace-obfuscation", "libdd-trace-protobuf 3.0.1", + "libdd-trace-stats 2.0.0", "libdd-trace-utils 3.0.1", "reqwest", "rmp-serde", @@ -578,6 +580,7 @@ dependencies = [ "serial_test", "temp-env", "tempfile", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -698,7 +701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1430,8 +1433,8 @@ checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libdd-capabilities" -version = "0.1.0" -source = "git+https://github.com/DataDog/libdatadog?rev=27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a#27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" +version = "1.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" dependencies = [ "anyhow", "bytes", @@ -1441,14 +1444,14 @@ dependencies = [ [[package]] name = "libdd-capabilities-impl" -version = "0.1.0" -source = "git+https://github.com/DataDog/libdatadog?rev=27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a#27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" +version = "1.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" dependencies = [ "bytes", "http", "http-body-util", "libdd-capabilities", - "libdd-common 3.0.2", + "libdd-common 4.0.0", ] [[package]] @@ -1484,8 +1487,8 @@ dependencies = [ [[package]] name = "libdd-common" -version = "3.0.2" -source = "git+https://github.com/DataDog/libdatadog?rev=27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a#27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" +version = "4.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" dependencies = [ "anyhow", "bytes", @@ -1529,12 +1532,12 @@ dependencies = [ "http", "http-body-util", "libdd-common 2.0.1", - "libdd-ddsketch", + "libdd-ddsketch 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "libdd-dogstatsd-client", "libdd-telemetry", "libdd-tinybytes 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libdd-trace-protobuf 2.0.0", - "libdd-trace-stats", + "libdd-trace-stats 1.0.3", "libdd-trace-utils 2.0.2", "rmp-serde", "serde", @@ -1555,6 +1558,14 @@ dependencies = [ "prost 0.14.3", ] +[[package]] +name = "libdd-ddsketch" +version = "1.0.1" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" +dependencies = [ + "prost 0.14.3", +] + [[package]] name = "libdd-dogstatsd-client" version = "1.0.1" @@ -1569,6 +1580,37 @@ dependencies = [ "tracing", ] +[[package]] +name = "libdd-library-config" +version = "1.1.0" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" +dependencies = [ + "anyhow", + "libc", + "libdd-trace-protobuf 3.0.1", + "memfd", + "prost 0.14.3", + "rand 0.8.6", + "rmp", + "rmp-serde", + "serde", + "serde_yaml", +] + +[[package]] +name = "libdd-shared-runtime" +version = "0.1.0" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" +dependencies = [ + "async-trait", + "futures", + "libdd-capabilities", + "libdd-common 4.0.0", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "libdd-telemetry" version = "3.0.0" @@ -1583,7 +1625,7 @@ dependencies = [ "http-body-util", "libc", "libdd-common 2.0.1", - "libdd-ddsketch", + "libdd-ddsketch 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "serde_json", "sys-info", @@ -1606,7 +1648,7 @@ dependencies = [ [[package]] name = "libdd-tinybytes" version = "1.1.0" -source = "git+https://github.com/DataDog/libdatadog?rev=27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a#27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" dependencies = [ "serde", ] @@ -1624,7 +1666,7 @@ dependencies = [ [[package]] name = "libdd-trace-normalization" version = "2.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a#27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" dependencies = [ "anyhow", "libdd-trace-protobuf 3.0.1", @@ -1633,11 +1675,11 @@ dependencies = [ [[package]] name = "libdd-trace-obfuscation" version = "2.0.0" -source = "git+https://github.com/DataDog/libdatadog?rev=27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a#27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" dependencies = [ "anyhow", "fluent-uri", - "libdd-common 3.0.2", + "libdd-common 4.0.0", "libdd-trace-protobuf 3.0.1", "libdd-trace-utils 3.0.1", "log", @@ -1661,7 +1703,7 @@ dependencies = [ [[package]] name = "libdd-trace-protobuf" version = "3.0.1" -source = "git+https://github.com/DataDog/libdatadog?rev=27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a#27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" dependencies = [ "prost 0.14.3", "serde", @@ -1675,11 +1717,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea447dc8a5d84c6b5eb6ea877c4fea4149fd29f6b45fcfc5cfd7edf82a18e056" dependencies = [ "hashbrown 0.15.5", - "libdd-ddsketch", + "libdd-ddsketch 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "libdd-trace-protobuf 2.0.0", "libdd-trace-utils 2.0.2", ] +[[package]] +name = "libdd-trace-stats" +version = "2.0.0" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" +dependencies = [ + "anyhow", + "async-trait", + "hashbrown 0.15.5", + "http", + "libdd-capabilities", + "libdd-capabilities-impl", + "libdd-common 4.0.0", + "libdd-ddsketch 1.0.1 (git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3)", + "libdd-shared-runtime", + "libdd-trace-protobuf 3.0.1", + "libdd-trace-utils 3.0.1", + "rmp-serde", + "serde", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "libdd-trace-utils" version = "2.0.2" @@ -1711,7 +1776,7 @@ dependencies = [ [[package]] name = "libdd-trace-utils" version = "3.0.1" -source = "git+https://github.com/DataDog/libdatadog?rev=27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a#27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" +source = "git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3#dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" dependencies = [ "anyhow", "base64 0.22.1", @@ -1729,8 +1794,8 @@ dependencies = [ "indexmap", "libdd-capabilities", "libdd-capabilities-impl", - "libdd-common 3.0.2", - "libdd-tinybytes 1.1.0 (git+https://github.com/DataDog/libdatadog?rev=27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a)", + "libdd-common 4.0.0", + "libdd-tinybytes 1.1.0 (git+https://github.com/DataDog/libdatadog?rev=dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3)", "libdd-trace-normalization 2.0.0", "libdd-trace-protobuf 3.0.1", "prost 0.14.3", @@ -1819,6 +1884,15 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +[[package]] +name = "memfd" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227" +dependencies = [ + "rustix 1.1.4", +] + [[package]] name = "mime" version = "0.3.17" @@ -1910,7 +1984,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2634,7 +2708,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2971,7 +3045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -3067,7 +3141,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index c89c5e2f..9c0a9bed 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -123,6 +123,8 @@ libdd-common,https://github.com/DataDog/libdatadog/tree/main/datadog-common,Apac libdd-data-pipeline,https://github.com/DataDog/libdatadog/tree/main/libdd-data-pipeline,Apache-2.0,The libdd-data-pipeline Authors libdd-ddsketch,https://github.com/DataDog/libdatadog/tree/main/libdd-ddsketch,Apache-2.0,The libdd-ddsketch Authors libdd-dogstatsd-client,https://github.com/DataDog/libdatadog/tree/main/libdd-dogstatsd-client,Apache-2.0,The libdd-dogstatsd-client Authors +libdd-library-config,https://github.com/DataDog/libdatadog/tree/main/libdd-library-config,Apache-2.0,The libdd-library-config Authors +libdd-shared-runtime,https://github.com/DataDog/libdatadog/tree/main/libdd-shared-runtime,Apache-2.0,The libdd-shared-runtime Authors libdd-telemetry,https://github.com/DataDog/libdatadog/tree/main/libdd-telemetry,Apache-2.0,The libdd-telemetry 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 @@ -139,6 +141,7 @@ lru,https://github.com/jeromefroe/lru-rs,MIT,Jerome Froelich 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-agent-config/Cargo.toml b/crates/datadog-agent-config/Cargo.toml index 75da8de0..ebb69ad3 100644 --- a/crates/datadog-agent-config/Cargo.toml +++ b/crates/datadog-agent-config/Cargo.toml @@ -6,8 +6,8 @@ license.workspace = true [dependencies] figment = { version = "0.10", default-features = false, features = ["yaml", "env"] } -libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" } +libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } log = { version = "0.4", default-features = false } serde = { version = "1.0", default-features = false, features = ["derive"] } serde-aux = { version = "4.7", default-features = false } diff --git a/crates/datadog-serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml index 095ecfc4..4dc7fcc6 100644 --- a/crates/datadog-serverless-compat/Cargo.toml +++ b/crates/datadog-serverless-compat/Cargo.toml @@ -12,7 +12,7 @@ windows-pipes = ["datadog-trace-agent/windows-pipes", "dogstatsd/windows-pipes"] [dependencies] datadog-logs-agent = { path = "../datadog-logs-agent" } datadog-trace-agent = { path = "../datadog-trace-agent" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" } +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } datadog-fips = { path = "../datadog-fips", default-features = false } dogstatsd = { path = "../dogstatsd", default-features = true } reqwest = { version = "0.12.4", default-features = false } diff --git a/crates/datadog-serverless-compat/src/main.rs b/crates/datadog-serverless-compat/src/main.rs index 8c20c41a..bd5f2337 100644 --- a/crates/datadog-serverless-compat/src/main.rs +++ b/crates/datadog-serverless-compat/src/main.rs @@ -18,7 +18,8 @@ use zstd::zstd_safe::CompressionLevel; use datadog_trace_agent::{ aggregator::TraceAggregator, - config, env_verifier, mini_agent, proxy_flusher, stats_flusher, stats_processor, + config, env_verifier, mini_agent, proxy_flusher, stats_concentrator_service, stats_flusher, + stats_processor, trace_flusher::{self, TraceFlusher}, trace_processor, }; @@ -49,6 +50,11 @@ const DEFAULT_DOGSTATSD_PORT: u16 = 8125; const DEFAULT_LOG_INTAKE_PORT: u16 = 10517; const AGENT_HOST: &str = "0.0.0.0"; +struct StatsConcentratorComponents { + handle: stats_concentrator_service::StatsConcentratorHandle, + service_handle: tokio::task::JoinHandle<()>, +} + #[tokio::main] pub async fn main() { let log_level = env::var("DD_LOG_LEVEL") @@ -119,6 +125,11 @@ pub async fn main() { .ok() .and_then(|v| v.parse::().ok()) .unwrap_or(DEFAULT_LOG_INTAKE_PORT); + + let dd_agent_stats_computation_enabled = env::var("DD_AGENT_STATS_COMPUTATION_ENABLED") + .map(|val| val.to_lowercase() != "false") + .unwrap_or(true); + debug!("Starting serverless trace mini agent"); let env_filter = format!("h2=off,hyper=off,rustls=off,{}", log_level); @@ -144,11 +155,6 @@ pub async fn main() { let env_verifier = Arc::new(env_verifier::ServerlessEnvVerifier::default()); - let trace_processor = Arc::new(trace_processor::ServerlessTraceProcessor {}); - - let stats_flusher = Arc::new(stats_flusher::ServerlessStatsFlusher {}); - let stats_processor = Arc::new(stats_processor::ServerlessStatsProcessor {}); - let config = match config::Config::new() { Ok(c) => Arc::new(c), Err(e) => { @@ -157,6 +163,28 @@ pub async fn main() { } }; + let stats_concentrator = if dd_agent_stats_computation_enabled { + info!("agent stats computation enabled"); + let (service, handle) = + stats_concentrator_service::StatsConcentratorService::new(config.clone()); + Some(StatsConcentratorComponents { + service_handle: tokio::spawn(service.run()), + handle, + }) + } else { + info!("agent stats computation disabled"); + None + }; + + let trace_processor = Arc::new(trace_processor::ServerlessTraceProcessor { + stats_concentrator: stats_concentrator.as_ref().map(|c| c.handle.clone()), + }); + + let stats_flusher = Arc::new(stats_flusher::ServerlessStatsFlusher { + stats_concentrator: stats_concentrator.as_ref().map(|c| c.handle.clone()), + }); + let stats_processor = Arc::new(stats_processor::ServerlessStatsProcessor {}); + let trace_aggregator = Arc::new(TokioMutex::new(TraceAggregator::default())); let trace_flusher = Arc::new(trace_flusher::ServerlessTraceFlusher::new( trace_aggregator, @@ -175,8 +203,11 @@ pub async fn main() { proxy_flusher, }); + let (_shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel::<()>(); tokio::spawn(async move { - let res = mini_agent.start_mini_agent().await; + let res = mini_agent + .start_mini_agent(shutdown_rx, stats_concentrator.map(|c| c.service_handle)) + .await; if let Err(e) = res { error!("Error when starting serverless trace mini agent: {e:?}"); } diff --git a/crates/datadog-trace-agent/Cargo.toml b/crates/datadog-trace-agent/Cargo.toml index 1c7ad7f3..22054334 100644 --- a/crates/datadog-trace-agent/Cargo.toml +++ b/crates/datadog-trace-agent/Cargo.toml @@ -24,16 +24,22 @@ async-trait = "0.1.64" tracing = { version = "0.1", default-features = false } serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0" -libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" } -libdd-capabilities-impl = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" } -libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" } -libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" } -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a", features = [ +thiserror = { version = "1.0.58", default-features = false } +libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } +libdd-capabilities-impl = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } +libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } +libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } +libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } +libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3", features = [ "mini_agent", ] } -libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a" } +libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3" } datadog-fips = { path = "../datadog-fips" } -reqwest = { version = "0.12.23", features = ["json", "http2"], default-features = false } +reqwest = { version = "0.12.23", features = [ + "json", + "http2", +], default-features = false } bytes = "1.10.1" [dev-dependencies] @@ -42,6 +48,6 @@ serial_test = "2.0.0" duplicate = "2.0.1" temp-env = "0.3.6" tempfile = "3.3.0" -libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "27aa92cfeeca073d8730a8b4974bd3fdef7ddf3a", features = [ +libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "dbd3ecb74cdad68d1efe3f0024cc3551f502a4c3", features = [ "test-utils", ] } diff --git a/crates/datadog-trace-agent/src/config.rs b/crates/datadog-trace-agent/src/config.rs index ddbd8207..14f90ed7 100644 --- a/crates/datadog-trace-agent/src/config.rs +++ b/crates/datadog-trace-agent/src/config.rs @@ -109,6 +109,7 @@ pub struct Config { /// timeout for environment verification, in milliseconds pub verify_env_timeout_ms: u64, pub proxy_url: Option, + pub env: String, } impl Config { @@ -251,6 +252,7 @@ impl Config { .or_else(|_| env::var("HTTPS_PROXY")) .ok(), tags, + env: env::var("DD_ENV").unwrap_or_else(|_| "none".to_string()), }) } } @@ -725,6 +727,7 @@ pub mod test_helpers { proxy_request_retry_backoff_base_ms: 100, verify_env_timeout_ms: 1000, proxy_url: None, + env: "none".to_string(), } } } diff --git a/crates/datadog-trace-agent/src/lib.rs b/crates/datadog-trace-agent/src/lib.rs index a87bf56b..4c37f08e 100644 --- a/crates/datadog-trace-agent/src/lib.rs +++ b/crates/datadog-trace-agent/src/lib.rs @@ -13,6 +13,7 @@ pub mod env_verifier; pub mod http_utils; pub mod mini_agent; pub mod proxy_flusher; +pub mod stats_concentrator_service; pub mod stats_flusher; pub mod stats_processor; pub mod trace_flusher; diff --git a/crates/datadog-trace-agent/src/mini_agent.rs b/crates/datadog-trace-agent/src/mini_agent.rs index ae074810..ef2660d9 100644 --- a/crates/datadog-trace-agent/src/mini_agent.rs +++ b/crates/datadog-trace-agent/src/mini_agent.rs @@ -11,6 +11,7 @@ use std::net::SocketAddr; use std::sync::Arc; use std::time::Instant; use tokio::sync::mpsc::{self, Receiver, Sender}; +use tokio::sync::oneshot; use tracing::{debug, error}; use crate::http_utils::{log_and_create_http_response, verify_request_content_length}; @@ -50,7 +51,11 @@ pub struct MiniAgent { } impl MiniAgent { - pub async fn start_mini_agent(&self) -> Result<(), Box> { + pub async fn start_mini_agent( + &self, + shutdown_rx: tokio::sync::oneshot::Receiver<()>, + stats_concentrator_service_handle: Option>, + ) -> Result<(), Box> { let now = Instant::now(); // verify we are in a serverless function environment. if not, shut down the mini agent. @@ -88,12 +93,17 @@ impl MiniAgent { Receiver, ) = mpsc::channel(STATS_PAYLOAD_CHANNEL_BUFFER_SIZE); + // Create a separate shutdown channel for the stats flusher so that serve_tcp + // can drain all in-flight HTTP handlers before triggering the final flush, + // preventing AddChunk/ClientStatsPayload messages from being missed. + let (flusher_shutdown_tx, flusher_shutdown_rx) = oneshot::channel::<()>(); + // start our stats flusher. let stats_flusher = self.stats_flusher.clone(); let stats_config = self.config.clone(); let stats_flusher_handle = tokio::spawn(async move { stats_flusher - .start_stats_flusher(stats_config, stats_rx) + .start_stats_flusher(stats_config, stats_rx, flusher_shutdown_rx) .await; }); @@ -163,6 +173,9 @@ impl MiniAgent { service, trace_flusher_handle, stats_flusher_handle, + stats_concentrator_service_handle, + shutdown_rx, + flusher_shutdown_tx, ) .await?; } @@ -215,6 +228,9 @@ impl MiniAgent { service, trace_flusher_handle, stats_flusher_handle, + stats_concentrator_service_handle, + shutdown_rx, + flusher_shutdown_tx, ) .await?; } @@ -226,7 +242,10 @@ impl MiniAgent { listener: tokio::net::TcpListener, service: S, mut trace_flusher_handle: tokio::task::JoinHandle<()>, - mut stats_flusher_handle: tokio::task::JoinHandle<()>, + stats_flusher_handle: tokio::task::JoinHandle<()>, + mut stats_concentrator_service_handle: Option>, + mut shutdown_rx: oneshot::Receiver<()>, + flusher_shutdown_tx: oneshot::Sender<()>, ) -> Result<(), Box> where S: hyper::service::Service< @@ -240,6 +259,7 @@ impl MiniAgent { { let server = hyper::server::conn::http1::Builder::new(); let mut joinset = tokio::task::JoinSet::new(); + let mut stats_flusher_handle = stats_flusher_handle; loop { let conn = tokio::select! { @@ -273,12 +293,35 @@ impl MiniAgent { }, // If there's some error in the background tasks, we can't send data result = &mut trace_flusher_handle => { - error!("Trace flusher task died: {:?}", result); - return Err("Trace flusher task terminated unexpectedly".into()); + return Err(format!("Trace flusher task terminated unexpectedly: {result:?}").into()); }, result = &mut stats_flusher_handle => { - error!("Stats flusher task died: {:?}", result); - return Err("Stats flusher task terminated unexpectedly".into()); + return Err(format!("Stats flusher task terminated unexpectedly: {result:?}").into()); + }, + result = async { + match stats_concentrator_service_handle { + Some(ref mut h) => h.await, + None => std::future::pending().await, + } + } => { + return Err(format!("Stats concentrator service task terminated unexpectedly: {result:?}").into()); + }, + _ = &mut shutdown_rx => { + // Drain all in-flight connections so every handler has finished + // writing to the stats/trace channels before we trigger the flush. + while let Some(result) = joinset.join_next().await { + if let Err(e) = result + && e.is_panic() { + std::panic::resume_unwind(e.into_panic()); + } + } + // Signal the stats flusher to force-flush now that all handlers + // have finished writing to the channel. + let _ = flusher_shutdown_tx.send(()); + if let Err(e) = stats_flusher_handle.await { + return Err(format!("Stats flusher task failed during shutdown: {e:?}").into()); + } + return Ok(()); }, }; let conn = hyper_util::rt::TokioIo::new(conn); @@ -297,7 +340,10 @@ impl MiniAgent { pipe_name: &str, service: S, mut trace_flusher_handle: tokio::task::JoinHandle<()>, - mut stats_flusher_handle: tokio::task::JoinHandle<()>, + stats_flusher_handle: tokio::task::JoinHandle<()>, + mut stats_concentrator_service_handle: Option>, + mut shutdown_rx: oneshot::Receiver<()>, + flusher_shutdown_tx: oneshot::Sender<()>, ) -> Result<(), Box> where S: hyper::service::Service< @@ -311,6 +357,7 @@ impl MiniAgent { { let server = hyper::server::conn::http1::Builder::new(); let mut joinset = tokio::task::JoinSet::new(); + let mut stats_flusher_handle = stats_flusher_handle; loop { // Create a new pipe instance @@ -361,12 +408,32 @@ impl MiniAgent { }, // If there's some error in the background tasks, we can't send data result = &mut trace_flusher_handle => { - error!("Trace flusher task died: {:?}", result); - return Err("Trace flusher task terminated unexpectedly".into()); + return Err(format!("Trace flusher task terminated unexpectedly: {result:?}").into()); }, result = &mut stats_flusher_handle => { - error!("Stats flusher task died: {:?}", result); - return Err("Stats flusher task terminated unexpectedly".into()); + return Err(format!("Stats flusher task terminated unexpectedly: {result:?}").into()); + }, + result = async { + match stats_concentrator_service_handle { + Some(ref mut h) => h.await, + None => std::future::pending().await, + } + } => { + return Err(format!("Stats concentrator service task terminated unexpectedly: {result:?}").into()); + }, + _ = &mut shutdown_rx => { + while let Some(result) = joinset.join_next().await { + if let Err(e) = result { + if e.is_panic() { + std::panic::resume_unwind(e.into_panic()); + } + } + } + let _ = flusher_shutdown_tx.send(()); + if let Err(e) = stats_flusher_handle.await { + return Err(format!("Stats flusher task failed during shutdown: {e:?}").into()); + } + return Ok(()); }, }; @@ -521,7 +588,9 @@ impl MiniAgent { INFO_ENDPOINT_PATH, PROFILING_ENDPOINT_PATH ], - "client_drop_p0s": true, + // client_drop_p0s tells the tracer whether it should drop unsampled p0 traces before sending them. + // In order to actually support this, sampling rates need to be sent back to the tracer. + "client_drop_p0s": false, "config": config_json } ); diff --git a/crates/datadog-trace-agent/src/stats_concentrator_service.rs b/crates/datadog-trace-agent/src/stats_concentrator_service.rs new file mode 100644 index 00000000..e0330719 --- /dev/null +++ b/crates/datadog-trace-agent/src/stats_concentrator_service.rs @@ -0,0 +1,242 @@ +// Copyright 2023-Present Datadog, Inc. https://www.datadoghq.com/ +// SPDX-License-Identifier: Apache-2.0 + +use std::collections::HashMap; +use std::sync::Arc; +use tokio::sync::{mpsc, oneshot}; + +use crate::config::Config; +use libdd_library_config::tracer_metadata::TracerMetadata; +use libdd_trace_protobuf::pb::{ClientStatsPayload, TraceChunk}; +use libdd_trace_stats::span_concentrator::SpanConcentrator; +use std::time::{Duration, SystemTime}; +use tracing::error; + +const S_TO_NS: u64 = 1_000_000_000; +const BUCKET_DURATION_NS: u64 = 10 * S_TO_NS; // 10 seconds + +#[derive(Debug, thiserror::Error)] +pub enum StatsError { + #[error("Failed to send command to concentrator: {0}")] + SendError(Box>), + #[error("Failed to receive response from concentrator: {0}")] + RecvError(oneshot::error::RecvError), +} + +pub enum ConcentratorCommand { + AddChunk(Box, Arc), + Flush(bool, oneshot::Sender>), +} + +/// A cloneable handle to the stats concentrator service, safe to share across async tasks. +#[derive(Clone)] +pub struct StatsConcentratorHandle { + tx: mpsc::UnboundedSender, +} + +impl StatsConcentratorHandle { + #[must_use] + pub fn new(tx: mpsc::UnboundedSender) -> Self { + Self { tx } + } + + /// Adds a trace chunk for stats computation. + pub fn add_chunk( + &self, + chunk: TraceChunk, + metadata: Arc, + ) -> Result<(), StatsError> { + self.tx + .send(ConcentratorCommand::AddChunk(Box::new(chunk), metadata)) + .map_err(|e| StatsError::SendError(Box::new(e))) + } + + pub async fn flush(&self, force_flush: bool) -> Result, StatsError> { + let (response_tx, response_rx) = oneshot::channel(); + self.tx + .send(ConcentratorCommand::Flush(force_flush, response_tx)) + .map_err(|e| StatsError::SendError(Box::new(e)))?; + response_rx.await.map_err(StatsError::RecvError) + } +} + +fn new_concentrator() -> SpanConcentrator { + // TODO: set span_kinds_stats_computed and peer_tag_keys + SpanConcentrator::new( + Duration::from_nanos(BUCKET_DURATION_NS), + SystemTime::now(), + vec![], + vec![], + ) +} + +pub struct StatsConcentratorService { + /// One concentrator per unique TracerMetadata. + concentrators: HashMap, SpanConcentrator>, + rx: mpsc::UnboundedReceiver, + config: Arc, +} + +impl StatsConcentratorService { + #[must_use] + pub fn new(config: Arc) -> (Self, StatsConcentratorHandle) { + let (tx, rx) = mpsc::unbounded_channel(); + let handle = StatsConcentratorHandle::new(tx); + let service = Self { + concentrators: HashMap::new(), + rx, + config, + }; + (service, handle) + } + + pub async fn run(mut self) { + while let Some(command) = self.rx.recv().await { + match command { + ConcentratorCommand::AddChunk(chunk, metadata) => { + // A single tracer may produce payloads with different metadata depending on the + // integration. For example, the .NET process integration appends `-command` to + // the base service and omits the version. A separate concentrator is kept per + // unique metadata so that each payload's stats are flushed with the metadata + // from the originating payload. + let concentrator = self + .concentrators + .entry(Arc::clone(&metadata)) + .or_insert_with(new_concentrator); + + for span in &chunk.spans { + concentrator.add_span(span); + } + } + ConcentratorCommand::Flush(force_flush, response_tx) => { + self.handle_flush(force_flush, response_tx); + } + } + } + } + + fn handle_flush( + &mut self, + force_flush: bool, + response_tx: oneshot::Sender>, + ) { + let payloads = self + .concentrators + .iter_mut() + .filter_map(|(metadata, concentrator)| { + let stats_buckets = concentrator.flush(SystemTime::now(), force_flush); + if stats_buckets.is_empty() { + return None; + } + Some(ClientStatsPayload { + // Do not set hostname so the trace stats backend can aggregate stats properly + hostname: String::new(), + // Prefer env from the tracer payload, fall back to agent config + env: metadata + .service_env + .clone() + .filter(|s| !s.is_empty()) + .unwrap_or_else(|| self.config.env.clone()), + version: metadata.service_version.clone().unwrap_or_default(), + lang: metadata.tracer_language.clone(), + tracer_version: metadata.tracer_version.clone(), + // Not set for agent-computed stats; runtime_id identifies tracer-computed payloads + runtime_id: String::new(), + // Not supported yet + sequence: 0, + // Not supported yet + agent_aggregation: String::new(), + service: metadata.service_name.clone().unwrap_or_default(), + container_id: metadata.container_id.clone().unwrap_or_default(), + // Not supported yet + tags: vec![], + // Not supported yet + git_commit_sha: String::new(), + // Not supported yet + image_tag: String::new(), + stats: stats_buckets, + // Not supported yet + process_tags: String::new(), + // Not supported yet + process_tags_hash: 0, + }) + }) + .collect(); + if let Err(e) = response_tx.send(payloads) { + error!("Failed to return trace stats: {e:?}"); + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::config::test_helpers::create_tcp_test_config; + use libdd_trace_protobuf::pb::TraceChunk; + + fn make_metadata(language: &str, service: &str, version: &str) -> Arc { + Arc::new(TracerMetadata { + tracer_language: language.to_string(), + service_name: Some(service.to_string()), + service_version: Some(version.to_string()), + ..Default::default() + }) + } + + fn empty_chunk() -> TraceChunk { + TraceChunk { + spans: vec![], + ..Default::default() + } + } + + #[tokio::test] + async fn test_unique_metadata_gets_separate_concentrators() { + let config = Arc::new(create_tcp_test_config(0)); + let (service, handle) = StatsConcentratorService::new(config); + tokio::spawn(service.run()); + + handle + .add_chunk( + empty_chunk(), + make_metadata("python", "my-service", "1.0.0"), + ) + .unwrap(); + handle + .add_chunk( + empty_chunk(), + make_metadata("python", "my-service", "2.0.0"), + ) + .unwrap(); + handle + .add_chunk( + empty_chunk(), + make_metadata("nodejs", "my-service", "1.0.0"), + ) + .unwrap(); + + assert!(handle.flush(false).await.is_ok()); + } + + #[tokio::test] + async fn test_continues_with_same_metadata() { + let config = Arc::new(create_tcp_test_config(0)); + let (service, handle) = StatsConcentratorService::new(config); + tokio::spawn(service.run()); + + handle + .add_chunk( + empty_chunk(), + make_metadata("python", "my-service", "1.0.0"), + ) + .unwrap(); + handle + .add_chunk( + empty_chunk(), + make_metadata("python", "my-service", "1.0.0"), + ) + .unwrap(); + + assert!(handle.flush(false).await.is_ok()); + } +} diff --git a/crates/datadog-trace-agent/src/stats_flusher.rs b/crates/datadog-trace-agent/src/stats_flusher.rs index 198593cb..27ba3871 100644 --- a/crates/datadog-trace-agent/src/stats_flusher.rs +++ b/crates/datadog-trace-agent/src/stats_flusher.rs @@ -4,29 +4,65 @@ use async_trait::async_trait; use libdd_capabilities_impl::DefaultHttpClient; use std::{sync::Arc, time}; -use tokio::sync::{Mutex, mpsc::Receiver}; +use tokio::sync::mpsc::Receiver; +use tokio::sync::oneshot; use tracing::{debug, error}; use libdd_trace_protobuf::pb; use libdd_trace_utils::stats_utils; use crate::config::Config; +use crate::stats_concentrator_service::StatsConcentratorHandle; + +/// Serializes and sends a single `StatsPayload` to the intake. +async fn send_stats_payload(config: &Arc, payload: pb::StatsPayload) { + debug!("Stats payload to be sent: {payload:?}"); + let serialized = match stats_utils::serialize_stats_payload(payload) { + Ok(res) => res, + Err(err) => { + error!("Failed to serialize stats payload, dropping stats: {err}"); + return; + } + }; + #[allow(clippy::unwrap_used)] + match stats_utils::send_stats_payload::( + serialized, + &config.trace_stats_intake, + config.trace_stats_intake.api_key.as_ref().unwrap(), + ) + .await + { + Ok(_) => debug!("Successfully flushed stats"), + Err(e) => error!("Error sending stats: {e:?}"), + } +} #[async_trait] pub trait StatsFlusher { /// Starts a stats flusher that listens for stats payloads sent to the tokio mpsc Receiver, - /// implementing flushing logic that calls flush_stats. + /// implementing flushing logic that calls flush_stats. Runs until the shutdown signal fires, + /// at which point it performs a final force flush and returns. async fn start_stats_flusher( &self, config: Arc, - mut rx: Receiver, + rx: Receiver, + shutdown_rx: oneshot::Receiver<()>, ); /// Flushes stats to the Datadog trace stats intake. - async fn flush_stats(&self, config: Arc, traces: Vec); + /// `force_flush` controls whether in-progress concentrator buckets are flushed (true on + /// shutdown, false on normal interval flushes). + async fn flush_stats( + &self, + config: Arc, + client_stats: Vec, + force_flush: bool, + ); } #[derive(Clone)] -pub struct ServerlessStatsFlusher {} +pub struct ServerlessStatsFlusher { + pub stats_concentrator: Option, +} #[async_trait] impl StatsFlusher for ServerlessStatsFlusher { @@ -34,59 +70,65 @@ impl StatsFlusher for ServerlessStatsFlusher { &self, config: Arc, mut rx: Receiver, + mut shutdown_rx: oneshot::Receiver<()>, ) { - let buffer: Arc>> = Arc::new(Mutex::new(Vec::new())); - - let buffer_producer = buffer.clone(); - let buffer_consumer = buffer.clone(); - - tokio::spawn(async move { - while let Some(stats_payload) = rx.recv().await { - let mut buffer = buffer_producer.lock().await; - buffer.push(stats_payload); - } - }); + let mut interval = + tokio::time::interval(time::Duration::from_secs(config.stats_flush_interval_secs)); + let mut buffer: Vec = Vec::new(); loop { - tokio::time::sleep(time::Duration::from_secs(config.stats_flush_interval_secs)).await; + tokio::select! { + // Receive client stats and add them to the buffer + Some(stats) = rx.recv() => { + buffer.push(stats); + } + + // Drain client stats in buffer and stats from concentrator on interval + _ = interval.tick() => { + let client_stats = std::mem::take(&mut buffer); + // Flush if trace stats are received from the tracer + // or if there is a stats concentrator for agent computed trace stats + if !client_stats.is_empty() || self.stats_concentrator.is_some() { + self.flush_stats(config.clone(), client_stats, false).await; + } + } - let mut buffer = buffer_consumer.lock().await; - if !buffer.is_empty() { - self.flush_stats(config.clone(), buffer.to_vec()).await; - buffer.clear(); + _ = &mut shutdown_rx => { + // Drain any client stats that arrived before the shutdown signal + while let Ok(stats) = rx.try_recv() { + buffer.push(stats); + } + // Force flush all in progress concentrator stats buckets on shutdown signal + self.flush_stats(config.clone(), std::mem::take(&mut buffer), true).await; + return; + } } } } - async fn flush_stats(&self, config: Arc, stats: Vec) { - if stats.is_empty() { - return; + /// Flushes client computed stats from the tracer and serverless computed stats as separate payloads + async fn flush_stats( + &self, + config: Arc, + client_stats: Vec, + force_flush: bool, + ) { + // Flush client computed stats from the tracer + if !client_stats.is_empty() { + let payload = stats_utils::construct_stats_payload(client_stats); + send_stats_payload(&config, payload).await; } - debug!("Flushing {} stats", stats.len()); - - let stats_payload = stats_utils::construct_stats_payload(stats); - - debug!("Stats payload to be sent: {stats_payload:?}"); - - let serialized_stats_payload = match stats_utils::serialize_stats_payload(stats_payload) { - Ok(res) => res, - Err(err) => { - error!("Failed to serialize stats payload, dropping stats: {err}"); - return; - } - }; - #[allow(clippy::unwrap_used)] - match stats_utils::send_stats_payload::( - serialized_stats_payload, - &config.trace_stats_intake, - config.trace_stats_intake.api_key.as_ref().unwrap(), - ) - .await - { - Ok(_) => debug!("Successfully flushed stats"), - Err(e) => { - error!("Error sending stats: {e:?}") + // Flush agent computed trace stats from the stats concentrator + if let Some(ref concentrator) = self.stats_concentrator { + match concentrator.flush(force_flush).await { + Ok(agent_stats) if !agent_stats.is_empty() => { + let mut payload = stats_utils::construct_stats_payload(agent_stats); + payload.client_computed = false; + send_stats_payload(&config, payload).await; + } + Ok(_) => {} + Err(e) => error!("Failed to flush concentrator stats: {e}"), } } } diff --git a/crates/datadog-trace-agent/src/trace_processor.rs b/crates/datadog-trace-agent/src/trace_processor.rs index 96f82098..ff6bf790 100644 --- a/crates/datadog-trace-agent/src/trace_processor.rs +++ b/crates/datadog-trace-agent/src/trace_processor.rs @@ -6,8 +6,9 @@ use std::sync::Arc; use async_trait::async_trait; use hyper::{StatusCode, http}; use libdd_common::http_common; +use libdd_library_config::tracer_metadata::TracerMetadata; use tokio::sync::mpsc::Sender; -use tracing::debug; +use tracing::{debug, error}; use libdd_trace_obfuscation::obfuscate::obfuscate_span; use libdd_trace_protobuf::pb; @@ -18,6 +19,7 @@ use libdd_trace_utils::tracer_payload::{TraceChunkProcessor, TracerPayloadCollec use crate::{ config::Config, http_utils::{self, log_and_create_http_response, log_and_create_traces_success_http_response}, + stats_concentrator_service::StatsConcentratorHandle, }; const TRACER_PAYLOAD_FUNCTION_TAGS_TAG_KEY: &str = "_dd.tags.function"; @@ -65,7 +67,54 @@ impl TraceChunkProcessor for ChunkProcessor { } } #[derive(Clone)] -pub struct ServerlessTraceProcessor {} +pub struct ServerlessTraceProcessor { + pub stats_concentrator: Option, +} + +impl ServerlessTraceProcessor { + fn send_to_concentrator( + concentrator: &StatsConcentratorHandle, + payload: &TracerPayloadCollection, + ) { + if let TracerPayloadCollection::V07(tracer_payloads) = payload { + for tracer_payload in tracer_payloads { + // Fetch service from the `_dd.base_service` attribute on the root span + let service_name = tracer_payload + .chunks + .iter() + .flat_map(|c| c.spans.iter()) + .find(|s| s.parent_id == 0) + .and_then(|s| s.meta.get("_dd.base_service")) + .filter(|v| !v.is_empty()) + .cloned(); + let metadata = Arc::new(TracerMetadata { + schema_version: 2, + runtime_id: None, + tracer_language: tracer_payload.language_name.clone(), + tracer_version: tracer_payload.tracer_version.clone(), + hostname: String::new(), + service_name, + service_env: Some(tracer_payload.env.clone()), + service_version: Some(tracer_payload.app_version.clone()), + process_tags: None, + container_id: Some(tracer_payload.container_id.clone()), + }); + for chunk in &tracer_payload.chunks { + if let Err(e) = concentrator.add_chunk(chunk.clone(), Arc::clone(&metadata)) { + error!("Failed to send trace chunk to concentrator: {e}"); + } + } + } + } else { + let version = match payload { + TracerPayloadCollection::V04(_) => "V04", + TracerPayloadCollection::V05(_) => "V05", + TracerPayloadCollection::V07(_) => unreachable!(), + }; + error!("Unsupported tracer payload version {version}. Failed to send trace stats."); + } + } +} #[async_trait] impl TraceProcessor for ServerlessTraceProcessor { @@ -139,6 +188,13 @@ impl TraceProcessor for ServerlessTraceProcessor { } } + // Skip agent side stats computation if the tracer has already computed stats + if let Some(ref concentrator) = self.stats_concentrator + && !tracer_header_tags.client_computed_stats + { + Self::send_to_concentrator(concentrator, &payload); + } + let send_data = SendData::new(body_size, payload, tracer_header_tags, &config.trace_intake); // send trace payload to our trace flusher @@ -219,6 +275,7 @@ mod tests { ..Default::default() }, tags: Tags::from_env_string("env:test,service:my-service"), + env: "test-env".to_string(), } } @@ -254,7 +311,9 @@ mod tests { .body(http_common::Body::from(bytes)) .unwrap(); - let trace_processor = trace_processor::ServerlessTraceProcessor {}; + let trace_processor = trace_processor::ServerlessTraceProcessor { + stats_concentrator: None, + }; let res = trace_processor .process_traces( Arc::new(create_test_config()), @@ -326,7 +385,9 @@ mod tests { .body(http_common::Body::from(bytes)) .unwrap(); - let trace_processor = trace_processor::ServerlessTraceProcessor {}; + let trace_processor = trace_processor::ServerlessTraceProcessor { + stats_concentrator: None, + }; let res = trace_processor .process_traces( Arc::new(create_test_config()), diff --git a/crates/datadog-trace-agent/tests/common/helpers.rs b/crates/datadog-trace-agent/tests/common/helpers.rs index 6dd8d825..9808f474 100644 --- a/crates/datadog-trace-agent/tests/common/helpers.rs +++ b/crates/datadog-trace-agent/tests/common/helpers.rs @@ -23,6 +23,7 @@ pub async fn send_tcp_request( uri: &str, method: &str, body: Option>, + additional_headers: &[(&str, &str)], ) -> Result, Box> { let stream = timeout( Duration::from_secs(2), @@ -42,6 +43,10 @@ pub async fn send_tcp_request( .method(method) .header("Content-Type", "application/msgpack"); + for (name, value) in additional_headers { + request_builder = request_builder.header(*name, *value); + } + let response = if let Some(body_data) = body { let body_len = body_data.len(); request_builder = request_builder.header("Content-Length", body_len.to_string()); diff --git a/crates/datadog-trace-agent/tests/common/mock_server.rs b/crates/datadog-trace-agent/tests/common/mock_server.rs index f1beb1ac..cd0cd6b9 100644 --- a/crates/datadog-trace-agent/tests/common/mock_server.rs +++ b/crates/datadog-trace-agent/tests/common/mock_server.rs @@ -4,7 +4,7 @@ //! Simple mock HTTP server for testing flushers use http_body_util::BodyExt; -use hyper::{Request, Response, body::Incoming}; +use hyper::{Request, Response, StatusCode, body::Incoming}; use hyper_util::rt::TokioIo; use libdd_common::http_common; use std::net::SocketAddr; @@ -60,6 +60,7 @@ impl MockServer { // Capture the request let method = req.method().to_string(); let path = req.uri().path().to_string(); + let is_stats_intake = path.ends_with("/stats"); let headers: Vec<(String, String)> = req .headers() .iter() @@ -82,11 +83,18 @@ impl MockServer { body: body_bytes, }); - // Return 200 OK + // Trace intake accepts 2xx + // Stats intake accepts 202 + // see `libdd_trace_utils::stats_utils::send_stats_payload_with_client` + let (status, body) = if is_stats_intake { + (StatusCode::ACCEPTED, http_common::Body::empty()) + } else { + (StatusCode::OK, http_common::Body::from(r#"{"ok":true}"#)) + }; Ok::<_, hyper::http::Error>( Response::builder() - .status(200) - .body(http_common::Body::from(r#"{"ok":true}"#)) + .status(status) + .body(body) .unwrap(), ) } diff --git a/crates/datadog-trace-agent/tests/common/mocks.rs b/crates/datadog-trace-agent/tests/common/mocks.rs index 842c45f0..dfd98ccd 100644 --- a/crates/datadog-trace-agent/tests/common/mocks.rs +++ b/crates/datadog-trace-agent/tests/common/mocks.rs @@ -12,6 +12,7 @@ use libdd_trace_protobuf::pb; use libdd_trace_utils::trace_utils::{self, MiniAgentMetadata, SendData}; use std::sync::Arc; use tokio::sync::mpsc::{Receiver, Sender}; +use tokio::sync::oneshot; /// Mock trace processor that returns 200 OK for all requests #[allow(dead_code)] @@ -86,6 +87,7 @@ impl StatsFlusher for MockStatsFlusher { &self, _config: Arc, mut stats_rx: Receiver, + _shutdown_rx: oneshot::Receiver<()>, ) { // Consume messages from the channel without processing them while let Some(_stats) = stats_rx.recv().await { @@ -93,7 +95,12 @@ impl StatsFlusher for MockStatsFlusher { } } - async fn flush_stats(&self, _config: Arc, _traces: Vec) { + async fn flush_stats( + &self, + _config: Arc, + _traces: Vec, + _force_flush: bool, + ) { // Do nothing } } diff --git a/crates/datadog-trace-agent/tests/integration_test.rs b/crates/datadog-trace-agent/tests/integration_test.rs index 1491954f..6c5bdceb 100644 --- a/crates/datadog-trace-agent/tests/integration_test.rs +++ b/crates/datadog-trace-agent/tests/integration_test.rs @@ -28,7 +28,7 @@ const FLUSH_WAIT_DURATION: Duration = Duration::from_millis(1500); /// Helper to configure a config with mock server endpoints pub fn configure_mock_endpoints(config: &mut Config, mock_server_url: &str) { let trace_url = format!("{}/api/v0.2/traces", mock_server_url); - let stats_url = format!("{}/api/v0.6/stats", mock_server_url); + let stats_url = format!("{}/api/v0.2/stats", mock_server_url); config.trace_intake = libdd_common::Endpoint { url: trace_url.parse().unwrap(), @@ -45,25 +45,36 @@ pub fn configure_mock_endpoints(config: &mut Config, mock_server_url: &str) { } /// Helper to create a mini agent with real flushers -pub fn create_mini_agent_with_real_flushers(config: Arc) -> MiniAgent { +pub fn create_mini_agent_with_real_flushers( + config: Arc, +) -> (MiniAgent, tokio::task::JoinHandle<()>) { use datadog_trace_agent::{ - aggregator::TraceAggregator, stats_flusher::ServerlessStatsFlusher, - stats_processor::ServerlessStatsProcessor, trace_flusher::ServerlessTraceFlusher, + aggregator::TraceAggregator, stats_concentrator_service::StatsConcentratorService, + stats_flusher::ServerlessStatsFlusher, stats_processor::ServerlessStatsProcessor, + trace_flusher::ServerlessTraceFlusher, }; + let (service, stats_concentrator_handle) = StatsConcentratorService::new(config.clone()); + let stats_concentrator_service_handle = tokio::spawn(service.run()); + let aggregator = Arc::new(tokio::sync::Mutex::new(TraceAggregator::default())); - MiniAgent { + let mini_agent = MiniAgent { config: config.clone(), - trace_processor: Arc::new(ServerlessTraceProcessor {}), + trace_processor: Arc::new(ServerlessTraceProcessor { + stats_concentrator: Some(stats_concentrator_handle.clone()), + }), trace_flusher: Arc::new(ServerlessTraceFlusher::new( aggregator.clone(), config.clone(), )), stats_processor: Arc::new(ServerlessStatsProcessor {}), - stats_flusher: Arc::new(ServerlessStatsFlusher {}), + stats_flusher: Arc::new(ServerlessStatsFlusher { + stats_concentrator: Some(stats_concentrator_handle), + }), env_verifier: Arc::new(MockEnvVerifier), proxy_flusher: Arc::new(ProxyFlusher::new(config.clone())), - } + }; + (mini_agent, stats_concentrator_service_handle) } /// Helper to verify trace request sent to mock server @@ -102,6 +113,52 @@ pub fn verify_trace_request(mock_server: &common::mock_server::MockServer) { ); } +/// Helper to verify stats request sent to mock server +pub fn verify_stats_request(mock_server: &common::mock_server::MockServer) { + let stats_reqs = mock_server.get_requests_for_path("/api/v0.2/stats"); + + assert!( + !stats_reqs.is_empty(), + "Expected at least one stats request to mock server" + ); + + let stats_req = &stats_reqs[0]; + assert_eq!(stats_req.method, "POST", "Expected POST method"); + + let content_type = stats_req + .headers + .iter() + .find(|(k, _)| k.to_lowercase() == "content-type") + .map(|(_, v)| v.as_str()); + assert_eq!( + content_type, + Some("application/msgpack"), + "Expected msgpack content-type" + ); + + let api_key = stats_req + .headers + .iter() + .find(|(k, _)| k.to_lowercase() == "dd-api-key") + .map(|(_, v)| v.as_str()); + assert_eq!(api_key, Some("test-api-key"), "Expected API key header"); + + assert!( + !stats_req.body.is_empty(), + "Expected non-empty stats payload" + ); +} + +/// Helper to verify stats request was not sent to mock server +pub fn verify_no_stats_request(mock_server: &common::mock_server::MockServer) { + let stats_reqs = mock_server.get_requests_for_path("/api/v0.2/stats"); + assert!( + stats_reqs.is_empty(), + "Expected no stats request to mock server, received {} request(s)", + stats_reqs.len() + ); +} + #[cfg(test)] #[tokio::test] #[serial] @@ -110,7 +167,9 @@ async fn test_mini_agent_tcp_handles_requests() { let test_port = config.dd_apm_receiver_port; let mini_agent = MiniAgent { config: config.clone(), - trace_processor: Arc::new(ServerlessTraceProcessor {}), + trace_processor: Arc::new(ServerlessTraceProcessor { + stats_concentrator: None, + }), trace_flusher: Arc::new(MockTraceFlusher), stats_processor: Arc::new(MockStatsProcessor), stats_flusher: Arc::new(MockStatsFlusher), @@ -120,14 +179,15 @@ async fn test_mini_agent_tcp_handles_requests() { // Start the mini agent let agent_handle = tokio::spawn(async move { - let _ = mini_agent.start_mini_agent().await; + let (_shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel::<()>(); + let _ = mini_agent.start_mini_agent(shutdown_rx, None).await; }); // Give server time to start tokio::time::sleep(Duration::from_millis(100)).await; // Test /info endpoint - let info_response = send_tcp_request(test_port, "/info", "GET", None) + let info_response = send_tcp_request(test_port, "/info", "GET", None, &[]) .await .expect("Failed to send /info request"); assert_eq!( @@ -160,8 +220,8 @@ async fn test_mini_agent_tcp_handles_requests() { // Check client_drop_p0s flag assert_eq!( - json["client_drop_p0s"], true, - "Expected client_drop_p0s to be true" + json["client_drop_p0s"], false, + "Expected client_drop_p0s to be false" ); // Check config object @@ -181,9 +241,10 @@ async fn test_mini_agent_tcp_handles_requests() { // Test /v0.4/traces endpoint with real trace data let trace_payload = create_test_trace_payload(); - let trace_response = send_tcp_request(test_port, "/v0.4/traces", "POST", Some(trace_payload)) - .await - .expect("Failed to send /v0.4/traces request"); + let trace_response = + send_tcp_request(test_port, "/v0.4/traces", "POST", Some(trace_payload), &[]) + .await + .expect("Failed to send /v0.4/traces request"); assert_eq!( trace_response.status(), StatusCode::OK, @@ -206,7 +267,9 @@ async fn test_mini_agent_named_pipe_handles_requests() { let mini_agent = MiniAgent { config: config.clone(), - trace_processor: Arc::new(ServerlessTraceProcessor {}), + trace_processor: Arc::new(ServerlessTraceProcessor { + stats_concentrator: None, + }), trace_flusher: Arc::new(MockTraceFlusher), stats_processor: Arc::new(MockStatsProcessor), stats_flusher: Arc::new(MockStatsFlusher), @@ -216,7 +279,8 @@ async fn test_mini_agent_named_pipe_handles_requests() { // Start the mini agent let agent_handle = tokio::spawn(async move { - let _ = mini_agent.start_mini_agent().await; + let (_shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel::<()>(); + let _ = mini_agent.start_mini_agent(shutdown_rx, None).await; }); // Give server time to create pipe @@ -285,17 +349,128 @@ async fn test_mini_agent_tcp_with_real_flushers() { let config = Arc::new(config); let test_port = config.dd_apm_receiver_port; - let mini_agent = create_mini_agent_with_real_flushers(config); + let (mini_agent, stats_concentrator_service_handle) = + create_mini_agent_with_real_flushers(config); + let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel::<()>(); let agent_handle = tokio::spawn(async move { - let _ = mini_agent.start_mini_agent().await; + let _ = mini_agent + .start_mini_agent(shutdown_rx, Some(stats_concentrator_service_handle)) + .await; }); // Wait for server to be ready let mut server_ready = false; for _ in 0..20 { tokio::time::sleep(Duration::from_millis(50)).await; - if let Ok(response) = send_tcp_request(test_port, "/info", "GET", None).await + if let Ok(response) = send_tcp_request(test_port, "/info", "GET", None, &[]).await { + if response.status().is_success() { + server_ready = true; + break; + } + } + } + assert!( + server_ready, + "Mini agent server failed to start within timeout" + ); + + // Send trace data + let trace_payload = create_test_trace_payload(); + let trace_response = + send_tcp_request(test_port, "/v0.4/traces", "POST", Some(trace_payload), &[]) + .await + .expect("Failed to send /v0.4/traces request"); + assert_eq!(trace_response.status(), StatusCode::OK); + + // Wait for trace flush + tokio::time::sleep(FLUSH_WAIT_DURATION).await; + verify_trace_request(&mock_server); + + // Trigger shutdown to force flush in progress concentrator buckets + let _ = shutdown_tx.send(()); + let _ = agent_handle.await; + verify_stats_request(&mock_server); // Stats generator should generate stats from trace payload +} + +#[cfg(test)] +#[tokio::test] +#[serial] +async fn test_concentrator_task_death_shuts_down_mini_agent() { + let mock_server: MockServer = MockServer::start().await; + tokio::time::sleep(Duration::from_millis(50)).await; + + let mut config = create_tcp_test_config(8129); + configure_mock_endpoints(&mut config, &mock_server.url()); + let config = Arc::new(config); + let test_port = config.dd_apm_receiver_port; + + let (mini_agent, stats_concentrator_service_handle) = + create_mini_agent_with_real_flushers(config); + let abort_handle = stats_concentrator_service_handle.abort_handle(); + + let (_shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel::<()>(); + let agent_handle = tokio::spawn(async move { + mini_agent + .start_mini_agent(shutdown_rx, Some(stats_concentrator_service_handle)) + .await + .map_err(|e| e.to_string()) + }); + + // Wait for server to be ready + let mut server_ready = false; + for _ in 0..20 { + tokio::time::sleep(Duration::from_millis(50)).await; + if let Ok(response) = send_tcp_request(test_port, "/info", "GET", None, &[]).await + && response.status().is_success() + { + server_ready = true; + break; + } + } + assert!( + server_ready, + "Mini agent server failed to start within timeout" + ); + + // Kill the concentrator task to simulate unexpected task death + abort_handle.abort(); + + // Mini agent should detect the task death and exit with an error + let result = tokio::time::timeout(Duration::from_secs(2), agent_handle) + .await + .expect("mini agent should have exited after concentrator task death"); + assert!( + result.expect("agent task should not panic").is_err(), + "mini agent should return an error when the concentrator task dies" + ); +} + +#[cfg(test)] +#[tokio::test] +#[serial] +async fn test_mini_agent_tcp_with_real_flushers_and_tracer_computed_stats() { + let mock_server: MockServer = MockServer::start().await; + tokio::time::sleep(Duration::from_millis(50)).await; + + let mut config = create_tcp_test_config(8128); // use different port to avoid race condition with other tests + configure_mock_endpoints(&mut config, &mock_server.url()); + let config = Arc::new(config); + let test_port = config.dd_apm_receiver_port; + + let (mini_agent, _stats_concentrator_service_handle) = + create_mini_agent_with_real_flushers(config); + + let agent_handle = tokio::spawn(async move { + let (_shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel::<()>(); + let _ = mini_agent.start_mini_agent(shutdown_rx, None).await; + }); + + // Wait for server to be ready + let mut server_ready = false; + for _ in 0..20 { + tokio::time::sleep(Duration::from_millis(50)).await; + if let Ok(response) = send_tcp_request(test_port, "/info", "GET", None, &[]).await && response.status().is_success() { server_ready = true; @@ -309,16 +484,24 @@ async fn test_mini_agent_tcp_with_real_flushers() { // Send trace data let trace_payload = create_test_trace_payload(); - let trace_response = send_tcp_request(test_port, "/v0.4/traces", "POST", Some(trace_payload)) - .await - .expect("Failed to send /v0.4/traces request"); + let trace_response = send_tcp_request( + test_port, + "/v0.4/traces", + "POST", + Some(trace_payload), + &[("Datadog-Client-Computed-Stats", "true")], + ) + .await + .expect("Failed to send /v0.4/traces request"); assert_eq!(trace_response.status(), StatusCode::OK); // Wait for flush tokio::time::sleep(FLUSH_WAIT_DURATION).await; verify_trace_request(&mock_server); + verify_no_stats_request(&mock_server); // Stats generator should not generate stats from trace payload when Datadog-Client-Computed-Stats header is present in trace payload + // Clean up agent_handle.abort(); } @@ -336,10 +519,12 @@ async fn test_mini_agent_named_pipe_with_real_flushers() { config.dd_apm_receiver_port = 0; let config = Arc::new(config); - let mini_agent = create_mini_agent_with_real_flushers(config); + let (mini_agent, _stats_concentrator_service_handle) = + create_mini_agent_with_real_flushers(config); + let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel::<()>(); let agent_handle = tokio::spawn(async move { - let _ = mini_agent.start_mini_agent().await; + let _ = mini_agent.start_mini_agent(shutdown_rx, None).await; }); // Wait for server to be ready @@ -366,10 +551,12 @@ async fn test_mini_agent_named_pipe_with_real_flushers() { .expect("Failed to send /v0.4/traces request over named pipe"); assert_eq!(trace_response.status(), StatusCode::OK); - // Wait for flush + // Wait for trace flush tokio::time::sleep(FLUSH_WAIT_DURATION).await; - verify_trace_request(&mock_server); - agent_handle.abort(); + // Trigger shutdown to force flush in progress concentrator buckets + let _ = shutdown_tx.send(()); + let _ = agent_handle.await; + verify_stats_request(&mock_server); }