diff --git a/Cargo.lock b/Cargo.lock index bb973b8f..2a798d78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,6 +170,12 @@ dependencies = [ "generic-array", ] +[[package]] +name = "borrow-or-share" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0b364ead1874514c8c2855ab558056ebfeb775653e7ae45ff72f28f8f3166c" + [[package]] name = "bumpalo" version = "3.19.0" @@ -240,10 +246,11 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.32" +version = "1.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e" +checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" dependencies = [ + "find-msvc-tools", "shlex", ] @@ -386,7 +393,7 @@ dependencies = [ "clap", "criterion-plot", "is-terminal", - "itertools 0.10.5", + "itertools", "num-traits", "once_cell", "oorandom", @@ -407,7 +414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools 0.10.5", + "itertools", ] [[package]] @@ -476,6 +483,7 @@ dependencies = [ "hyper", "hyper-util", "libc", + "libdd-capabilities-impl", "libdd-common", "libdd-data-pipeline", "libdd-library-config", @@ -553,7 +561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -577,6 +585,23 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + +[[package]] +name = "fluent-uri" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc74ac4d8359ae70623506d512209619e5cf8f347124910440dbc221714b328e" +dependencies = [ + "borrow-or-share", + "ref-cast", + "serde", +] + [[package]] name = "fnv" version = "1.0.7" @@ -716,8 +741,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.1+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1124,15 +1151,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.15" @@ -1161,11 +1179,33 @@ version = "0.2.185" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +[[package]] +name = "libdd-capabilities" +version = "1.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" +dependencies = [ + "anyhow", + "bytes", + "http", + "thiserror 1.0.69", +] + +[[package]] +name = "libdd-capabilities-impl" +version = "1.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" +dependencies = [ + "bytes", + "http", + "http-body-util", + "libdd-capabilities", + "libdd-common", +] + [[package]] name = "libdd-common" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c779949577250487179d904508f18750070e9a01eb58dce378409ec5fa066f3b" +version = "4.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", "bytes", @@ -1195,18 +1235,21 @@ dependencies = [ [[package]] name = "libdd-data-pipeline" version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358411451d99011f13c7628acee25dc144f2bbeade87acf10fa7d5ffce1053dc" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", "arc-swap", + "async-trait", "bytes", "either", + "getrandom 0.2.16", "http", "http-body-util", + "libdd-capabilities", + "libdd-capabilities-impl", "libdd-common", - "libdd-ddsketch", "libdd-dogstatsd-client", + "libdd-shared-runtime", "libdd-telemetry", "libdd-tinybytes", "libdd-trace-protobuf 3.0.1", @@ -1225,8 +1268,7 @@ dependencies = [ [[package]] name = "libdd-ddsketch" version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b31b2435e2e8eaba0e35a96df3e1407b68f8ef76055383ceb2ba5a09e5a1bb5" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "prost", ] @@ -1234,8 +1276,7 @@ dependencies = [ [[package]] name = "libdd-dogstatsd-client" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f8eca39d1e2ef6267cf77fc51eb7ebc7d4f44827e150b4d317c29d8c33bf87" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", "cadence", @@ -1263,14 +1304,29 @@ dependencies = [ "serde_yaml", ] +[[package]] +name = "libdd-shared-runtime" +version = "0.1.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" +dependencies = [ + "async-trait", + "futures", + "libdd-capabilities", + "libdd-common", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "libdd-telemetry" version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78774ffce79da677602829d7fe27468283e5349010e974257233edf4cd12b783" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", + "async-trait", "base64 0.22.1", + "bytes", "futures", "hashbrown 0.15.5", "http", @@ -1278,6 +1334,7 @@ dependencies = [ "libc", "libdd-common", "libdd-ddsketch", + "libdd-shared-runtime", "serde", "serde_json", "sys-info", @@ -1291,8 +1348,7 @@ dependencies = [ [[package]] name = "libdd-tinybytes" version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47838e12ae2665250b4cdba4e3119230b79e3c522bb9f48dd0c87346f5a8f44" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "serde", ] @@ -1300,13 +1356,28 @@ dependencies = [ [[package]] name = "libdd-trace-normalization" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab12e095f3589d02ceed76556e7aa8a1b5bc928a900e143b624e2331294e54b5" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", "libdd-trace-protobuf 3.0.1", ] +[[package]] +name = "libdd-trace-obfuscation" +version = "2.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" +dependencies = [ + "anyhow", + "fluent-uri", + "libdd-common", + "libdd-trace-protobuf 3.0.1", + "libdd-trace-utils", + "log", + "percent-encoding", + "serde", + "serde_json", +] + [[package]] name = "libdd-trace-protobuf" version = "2.0.0" @@ -1321,8 +1392,7 @@ dependencies = [ [[package]] name = "libdd-trace-protobuf" version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1809242895edc53ac51a21287829f42474e749dbc222ea7f414cb3f0d1f91d4e" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "prost", "serde", @@ -1332,32 +1402,47 @@ dependencies = [ [[package]] name = "libdd-trace-stats" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92b882863f7c531d51e73f7bc5930c705e47829332128d9bdcad0fea3b2b942" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ + "anyhow", + "async-trait", "hashbrown 0.15.5", + "http", + "libdd-capabilities", + "libdd-capabilities-impl", + "libdd-common", "libdd-ddsketch", + "libdd-shared-runtime", + "libdd-trace-obfuscation", "libdd-trace-protobuf 3.0.1", "libdd-trace-utils", + "rmp-serde", + "serde", + "tokio", + "tokio-util", + "tracing", ] [[package]] name = "libdd-trace-utils" version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870506e9bb79c93ce5bbfe9d715c53c7ea393a177c7299f0bf43745c0adea0c7" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", + "base64 0.22.1", "bytes", "cargo-platform", "cargo_metadata", "futures", + "getrandom 0.2.16", "http", "http-body", "http-body-util", "httpmock", "hyper", "indexmap", + "libdd-capabilities", + "libdd-capabilities-impl", "libdd-common", "libdd-tinybytes", "libdd-trace-normalization", @@ -1830,7 +1915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools", "proc-macro2", "quote", "syn", @@ -1948,6 +2033,26 @@ dependencies = [ "bitflags", ] +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "regex" version = "1.11.1" @@ -2093,7 +2198,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2167,6 +2272,7 @@ version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" dependencies = [ + "indexmap", "itoa", "memchr", "ryu", @@ -2962,13 +3068,19 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-registry" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" dependencies = [ - "windows-link", + "windows-link 0.1.3", "windows-result", "windows-strings", ] @@ -2979,7 +3091,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -2988,7 +3100,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -3009,6 +3121,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows-targets" version = "0.48.5" diff --git a/Cargo.toml b/Cargo.toml index 27405c84..2dcf6f2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,11 +22,12 @@ description = "Reserved future DataDog package, contact info@datadoghq.com if yo authors = ["Datadog Inc. "] [workspace.dependencies] -# Libdatadog dependencies - change to a stable version once we release -libdd-data-pipeline = { version = "3.0.1", default-features = false } +# Libdatadog dependencies +libdd-data-pipeline = { version = "3.1.0", default-features = false, features = ["telemetry"] } libdd-trace-utils = { version = "3.0.0", default-features = false } -libdd-telemetry = { version = "4.0.0", default-features = false } -libdd-common = { version = "3.0.1", default-features = false } +libdd-telemetry = { version = "5.0.0", default-features = false } +libdd-common = { version = "4.0.0", default-features = false } +libdd-capabilities-impl = { version = "1.1.0", default-features = false } libdd-tinybytes = { version = "1.1.0", default-features = false } libdd-library-config = { version = "1.1.0", default-features = false } opentelemetry_sdk = { version = "0.31.0", features = [ @@ -55,7 +56,6 @@ serde_json = { version = "1.0.140" } hashbrown = { version = "0.15.5" } foldhash = { version = "0.1.5" } - [profile.dev] debug = 2 # full debug info diff --git a/datadog-opentelemetry/Cargo.toml b/datadog-opentelemetry/Cargo.toml index c07252b4..6c8be59b 100644 --- a/datadog-opentelemetry/Cargo.toml +++ b/datadog-opentelemetry/Cargo.toml @@ -60,6 +60,7 @@ criterion = { version = "0.5.1", optional = true } # Libdatadog dependencies libdd-data-pipeline = { workspace = true } +libdd-capabilities-impl = { workspace = true } libdd-trace-utils = { workspace = true } libdd-telemetry = { workspace = true } libdd-common = { workspace = true } diff --git a/datadog-opentelemetry/src/core/configuration/configuration.rs b/datadog-opentelemetry/src/core/configuration/configuration.rs index 3e3bdfda..4971b8e6 100644 --- a/datadog-opentelemetry/src/core/configuration/configuration.rs +++ b/datadog-opentelemetry/src/core/configuration/configuration.rs @@ -1963,6 +1963,8 @@ impl ConfigBuilder { config.dogstatsd_agent_url.set_calculated(url); } + crate::core::telemetry_session::install_process_lineage_env(config.runtime_id); + config } diff --git a/datadog-opentelemetry/src/core/mod.rs b/datadog-opentelemetry/src/core/mod.rs index b38404f0..44e4669a 100644 --- a/datadog-opentelemetry/src/core/mod.rs +++ b/datadog-opentelemetry/src/core/mod.rs @@ -12,6 +12,7 @@ mod error; pub mod log; pub(crate) mod telemetry; +pub mod telemetry_session; pub(crate) mod utils; #[cfg(feature = "test-utils")] diff --git a/datadog-opentelemetry/src/core/telemetry.rs b/datadog-opentelemetry/src/core/telemetry.rs index 2ba52b08..4d29dc32 100644 --- a/datadog-opentelemetry/src/core/telemetry.rs +++ b/datadog-opentelemetry/src/core/telemetry.rs @@ -16,6 +16,7 @@ use libdd_telemetry::{ }; use super::configuration::{Config, ConfigurationProvider}; +use super::telemetry_session; use crate::{dd_debug, dd_error, dd_warn}; static TELEMETRY: TelemetryCell = OnceLock::new(); @@ -249,6 +250,10 @@ fn make_telemetry_worker( builder.config = libdd_telemetry::config::Config::from_env(); builder.config.telemetry_heartbeat_interval = Duration::from_secs_f64(config.telemetry_heartbeat_interval()); + let inst = telemetry_session::sessions_from_runtime_id(config.runtime_id()); + builder.config.session_id = inst.session_id; + builder.config.root_session_id = inst.root_session_id; + builder.config.parent_session_id = inst.parent_session_id; // builder.config.debug_enabled = true; builder.run().map(|handle| { diff --git a/datadog-opentelemetry/src/core/telemetry_session.rs b/datadog-opentelemetry/src/core/telemetry_session.rs new file mode 100644 index 00000000..f037349d --- /dev/null +++ b/datadog-opentelemetry/src/core/telemetry_session.rs @@ -0,0 +1,140 @@ +// Copyright 2025-Present Datadog, Inc. https://www.datadoghq.com/ +// SPDX-License-Identifier: Apache-2.0 + +//! Instrumentation session ids from env (`dd-session-id` family). +//! Here `runtime_id` is unchanged across `fork()` (unlike some Datadog SDKs); set parent for a new +//! process with [`lineage_env_for_spawn`] or [`extend_command_env_with_lineage`]. + +pub use libdd_data_pipeline::trace_exporter::TelemetryInstrumentationSessions; + +/// Root lineage env key. +pub const ENV_ROOT_RS_SESSION_ID: &str = "_DD_ROOT_RS_SESSION_ID"; +/// Parent lineage env key. +pub const ENV_PARENT_RS_SESSION_ID: &str = "_DD_PARENT_RS_SESSION_ID"; + +/// Builds [`TelemetryInstrumentationSessions`] from `runtime_id` plus lineage env keys. +#[allow(clippy::disallowed_methods)] +pub fn sessions_from_runtime_id(runtime_id: &str) -> TelemetryInstrumentationSessions { + let session_id = runtime_id.to_owned(); + let root_session_id = std::env::var(ENV_ROOT_RS_SESSION_ID) + .ok() + .filter(|r| r != &session_id); + let parent_session_id = std::env::var(ENV_PARENT_RS_SESSION_ID) + .ok() + .filter(|p| p != &session_id); + TelemetryInstrumentationSessions { + session_id: Some(session_id), + root_session_id, + parent_session_id, + } +} + +/// Sets [`ENV_ROOT_RS_SESSION_ID`] if unset (does not replace an existing value). +/// +/// Must be called before spawning threads to avoid races on the process environment. +#[allow(clippy::disallowed_methods)] +pub fn install_process_lineage_env(runtime_id: &str) { + if std::env::var_os(ENV_ROOT_RS_SESSION_ID).is_none() { + std::env::set_var(ENV_ROOT_RS_SESSION_ID, runtime_id); + } +} + +/// Env pairs for [`std::process::Command`] (root + parent = this `runtime_id`). +#[allow(clippy::disallowed_methods)] +pub fn lineage_env_for_spawn(runtime_id: &str) -> [(&'static str, String); 2] { + let root = std::env::var(ENV_ROOT_RS_SESSION_ID).unwrap_or_else(|_| runtime_id.to_string()); + [ + (ENV_ROOT_RS_SESSION_ID, root), + (ENV_PARENT_RS_SESSION_ID, runtime_id.to_string()), + ] +} + +/// Merges [`lineage_env_for_spawn`] into `cmd`. +pub fn extend_command_env_with_lineage(cmd: &mut std::process::Command, runtime_id: &str) { + for (key, val) in lineage_env_for_spawn(runtime_id) { + cmd.env(key, val); + } +} + +#[cfg(test)] +mod tests { + use super::*; + + use std::sync::{Mutex, OnceLock}; + + fn env_mutation_lock() -> std::sync::MutexGuard<'static, ()> { + static LOCK: OnceLock> = OnceLock::new(); + LOCK.get_or_init(|| Mutex::new(())).lock().unwrap() + } + + #[test] + fn from_runtime_id_omits_root_parent_when_missing_env() { + let _l = env_mutation_lock(); + let root_before = std::env::var_os(ENV_ROOT_RS_SESSION_ID); + let parent_before = std::env::var_os(ENV_PARENT_RS_SESSION_ID); + std::env::remove_var(ENV_ROOT_RS_SESSION_ID); + std::env::remove_var(ENV_PARENT_RS_SESSION_ID); + let s = sessions_from_runtime_id("rid-a"); + assert_eq!(s.session_id.as_deref(), Some("rid-a")); + assert!(s.root_session_id.is_none()); + assert!(s.parent_session_id.is_none()); + restore_env_opt(ENV_ROOT_RS_SESSION_ID, root_before); + restore_env_opt(ENV_PARENT_RS_SESSION_ID, parent_before); + } + + #[test] + fn lineage_env_parent_is_current_runtime_id() { + let _l = env_mutation_lock(); + let before = std::env::var_os(ENV_ROOT_RS_SESSION_ID); + std::env::remove_var(ENV_ROOT_RS_SESSION_ID); + let env = lineage_env_for_spawn("run-1"); + assert_eq!(env[1].0, ENV_PARENT_RS_SESSION_ID); + assert_eq!(env[1].1, "run-1"); + restore_env_opt(ENV_ROOT_RS_SESSION_ID, before); + } + + #[test] + fn lineage_env_for_spawn_preserves_existing_root() { + let _l = env_mutation_lock(); + let before = std::env::var_os(ENV_ROOT_RS_SESSION_ID); + std::env::set_var(ENV_ROOT_RS_SESSION_ID, "existing-root"); + let env = lineage_env_for_spawn("run-2"); + assert_eq!(env[0].1, "existing-root"); + assert_eq!(env[1].1, "run-2"); + restore_env_opt(ENV_ROOT_RS_SESSION_ID, before); + } + + #[test] + fn from_runtime_id_captures_env_root_and_parent() { + let _l = env_mutation_lock(); + let root_before = std::env::var_os(ENV_ROOT_RS_SESSION_ID); + let parent_before = std::env::var_os(ENV_PARENT_RS_SESSION_ID); + std::env::set_var(ENV_ROOT_RS_SESSION_ID, "root-x"); + std::env::set_var(ENV_PARENT_RS_SESSION_ID, "parent-x"); + let s = sessions_from_runtime_id("current"); + assert_eq!(s.session_id.as_deref(), Some("current")); + assert_eq!(s.root_session_id.as_deref(), Some("root-x")); + assert_eq!(s.parent_session_id.as_deref(), Some("parent-x")); + restore_env_opt(ENV_ROOT_RS_SESSION_ID, root_before); + restore_env_opt(ENV_PARENT_RS_SESSION_ID, parent_before); + } + + #[test] + fn install_process_lineage_env_sets_root_when_missing() { + let _l = env_mutation_lock(); + let before = std::env::var_os(ENV_ROOT_RS_SESSION_ID); + std::env::remove_var(ENV_ROOT_RS_SESSION_ID); + install_process_lineage_env("root-a"); + assert_eq!(std::env::var(ENV_ROOT_RS_SESSION_ID).unwrap(), "root-a"); + install_process_lineage_env("root-b"); + assert_eq!(std::env::var(ENV_ROOT_RS_SESSION_ID).unwrap(), "root-a"); + restore_env_opt(ENV_ROOT_RS_SESSION_ID, before); + } + + fn restore_env_opt(key: &str, before: Option) { + match before { + None => std::env::remove_var(key), + Some(v) => std::env::set_var(key, v), + } + } +} diff --git a/datadog-opentelemetry/src/exporter/mod.rs b/datadog-opentelemetry/src/exporter/mod.rs index 1f8dd3e8..0c341ff2 100644 --- a/datadog-opentelemetry/src/exporter/mod.rs +++ b/datadog-opentelemetry/src/exporter/mod.rs @@ -9,12 +9,15 @@ use std::{ }; use crate::{dd_debug, dd_error}; +use libdd_capabilities_impl::NativeCapabilities; use libdd_data_pipeline::trace_exporter::{ agent_response::AgentResponse, error::{self as trace_exporter_error, TraceExporterError}, - TraceExporter, TraceExporterBuilder, + TraceExporter as LibddTraceExporter, TraceExporterBuilder, }; +pub type TraceExporter = LibddTraceExporter; + #[derive(Clone, Copy)] pub struct AsyncExporterConfig { /// Whether the async exporter waits for the trace chunks to be exported before returning from @@ -583,7 +586,7 @@ impl TraceExporterWorker { ) -> TraceExporterHandle { let handle = thread::spawn({ move || { - let trace_exporter = match builder.build() { + let trace_exporter = match builder.build::() { Ok(exporter) => exporter, Err(e) => { return Err(e); @@ -607,10 +610,17 @@ impl TraceExporterWorker { fn run(mut self) -> Result<(), TraceExporterError> { #[cfg(feature = "test-utils")] { - // Wait for the agent info to be fetched to get deterministic output when deciding - // to drop traces or not - self.trace_exporter - .wait_agent_info_ready(Duration::from_secs(5)) + // Wait for agent info before first export for deterministic sampling decisions. + // `wait_agent_info_ready` is async; a dedicated runtime is required because this + // runs inside a plain `thread::spawn` with no surrounding executor. + tokio::runtime::Builder::new_current_thread() + .enable_all() + .build() + .expect("tokio runtime for wait_agent_info_ready") + .block_on( + self.trace_exporter + .wait_agent_info_ready(Duration::from_secs(5)), + ) .unwrap(); } while let Ok((message, data)) = self.rx.receive(self.config.max_flush_interval) { diff --git a/datadog-opentelemetry/src/lib.rs b/datadog-opentelemetry/src/lib.rs index 3bc1af02..0dd9b6d2 100644 --- a/datadog-opentelemetry/src/lib.rs +++ b/datadog-opentelemetry/src/lib.rs @@ -245,6 +245,11 @@ pub(crate) mod core; // Public re-exports pub use core::configuration; pub use core::log; +pub use core::telemetry_session::{ + extend_command_env_with_lineage, install_process_lineage_env, lineage_env_for_spawn, + sessions_from_runtime_id, TelemetryInstrumentationSessions, ENV_PARENT_RS_SESSION_ID, + ENV_ROOT_RS_SESSION_ID, +}; #[cfg(feature = "test-utils")] #[allow(missing_docs)] diff --git a/datadog-opentelemetry/src/span_exporter.rs b/datadog-opentelemetry/src/span_exporter.rs index dbacfdad..6e739e17 100644 --- a/datadog-opentelemetry/src/span_exporter.rs +++ b/datadog-opentelemetry/src/span_exporter.rs @@ -5,15 +5,17 @@ use std::{sync::Arc, time::Duration}; use arc_swap::ArcSwap; use libdd_data_pipeline::trace_exporter::{ - agent_response::AgentResponse, error::TraceExporterError, TelemetryConfig, TraceExporter, + agent_response::AgentResponse, error::TraceExporterError, TelemetryConfig, TraceExporterOutputFormat, }; + use opentelemetry_sdk::{trace::SpanData, Resource}; use crate::{ configuration::Config, + core::telemetry_session, ddtrace_transform, - exporter::{AsyncExporterError, AsyncTraceExporter, Exporter, TraceChunk}, + exporter::{AsyncExporterError, AsyncTraceExporter, Exporter, TraceChunk, TraceExporter}, mappings::CachedConfig, }; @@ -61,6 +63,9 @@ impl DatadogExporter { runtime_id: Some(config.runtime_id().to_string()), debug_enabled: false, }); + builder.set_telemetry_instrumentation_sessions( + telemetry_session::sessions_from_runtime_id(config.runtime_id()), + ); } DatadogExporter { exporter: AsyncTraceExporter::new( diff --git a/instrumentation/Cargo.lock b/instrumentation/Cargo.lock index beda616b..d611b897 100644 --- a/instrumentation/Cargo.lock +++ b/instrumentation/Cargo.lock @@ -54,6 +54,17 @@ dependencies = [ "syn", ] +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -93,6 +104,12 @@ dependencies = [ "generic-array", ] +[[package]] +name = "borrow-or-share" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0b364ead1874514c8c2855ab558056ebfeb775653e7ae45ff72f28f8f3166c" + [[package]] name = "bumpalo" version = "3.20.2" @@ -116,9 +133,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.60" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "shlex", @@ -138,11 +155,12 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "const_format" -version = "0.2.35" +version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" +checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e" dependencies = [ "const_format_proc_macros", + "konst", ] [[package]] @@ -219,6 +237,7 @@ dependencies = [ "hyper", "hyper-util", "libc", + "libdd-capabilities-impl", "libdd-common", "libdd-data-pipeline", "libdd-library-config", @@ -229,7 +248,8 @@ dependencies = [ "opentelemetry", "opentelemetry-semantic-conventions", "opentelemetry_sdk", - "rand 0.8.5", + "percent-encoding", + "rand 0.8.6", "rustc_version_runtime", "serde", "serde_json", @@ -278,6 +298,17 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +[[package]] +name = "fluent-uri" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc74ac4d8359ae70623506d512209619e5cf8f347124910440dbc221714b328e" +dependencies = [ + "borrow-or-share", + "ref-cast", + "serde", +] + [[package]] name = "foldhash" version = "0.1.5" @@ -395,8 +426,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -448,9 +481,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "heck" @@ -566,7 +599,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "serde", "serde_core", ] @@ -588,14 +621,31 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.95" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" +checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" dependencies = [ + "cfg-if", + "futures-util", "once_cell", "wasm-bindgen", ] +[[package]] +name = "konst" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb" +dependencies = [ + "konst_macro_rules", +] + +[[package]] +name = "konst_macro_rules" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" + [[package]] name = "lambda_runtime" version = "0.13.0" @@ -659,15 +709,37 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libc" -version = "0.2.185" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" + +[[package]] +name = "libdd-capabilities" +version = "1.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" +dependencies = [ + "anyhow", + "bytes", + "http", + "thiserror 1.0.69", +] + +[[package]] +name = "libdd-capabilities-impl" +version = "1.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" +dependencies = [ + "bytes", + "http", + "http-body-util", + "libdd-capabilities", + "libdd-common", +] [[package]] name = "libdd-common" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c779949577250487179d904508f18750070e9a01eb58dce378409ec5fa066f3b" +version = "4.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", "bytes", @@ -697,18 +769,21 @@ dependencies = [ [[package]] name = "libdd-data-pipeline" version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358411451d99011f13c7628acee25dc144f2bbeade87acf10fa7d5ffce1053dc" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", "arc-swap", + "async-trait", "bytes", "either", + "getrandom 0.2.17", "http", "http-body-util", + "libdd-capabilities", + "libdd-capabilities-impl", "libdd-common", - "libdd-ddsketch", "libdd-dogstatsd-client", + "libdd-shared-runtime", "libdd-telemetry", "libdd-tinybytes", "libdd-trace-protobuf 3.0.1", @@ -727,8 +802,7 @@ dependencies = [ [[package]] name = "libdd-ddsketch" version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b31b2435e2e8eaba0e35a96df3e1407b68f8ef76055383ceb2ba5a09e5a1bb5" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "prost", ] @@ -736,8 +810,7 @@ dependencies = [ [[package]] name = "libdd-dogstatsd-client" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f8eca39d1e2ef6267cf77fc51eb7ebc7d4f44827e150b4d317c29d8c33bf87" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", "cadence", @@ -757,7 +830,7 @@ dependencies = [ "libdd-trace-protobuf 2.0.0", "memfd", "prost", - "rand 0.8.5", + "rand 0.8.6", "rmp", "rmp-serde", "rustix", @@ -765,14 +838,29 @@ dependencies = [ "serde_yaml", ] +[[package]] +name = "libdd-shared-runtime" +version = "0.1.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" +dependencies = [ + "async-trait", + "futures", + "libdd-capabilities", + "libdd-common", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "libdd-telemetry" version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78774ffce79da677602829d7fe27468283e5349010e974257233edf4cd12b783" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", + "async-trait", "base64 0.22.1", + "bytes", "futures", "hashbrown 0.15.5", "http", @@ -780,6 +868,7 @@ dependencies = [ "libc", "libdd-common", "libdd-ddsketch", + "libdd-shared-runtime", "serde", "serde_json", "sys-info", @@ -793,8 +882,7 @@ dependencies = [ [[package]] name = "libdd-tinybytes" version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47838e12ae2665250b4cdba4e3119230b79e3c522bb9f48dd0c87346f5a8f44" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "serde", ] @@ -802,13 +890,28 @@ dependencies = [ [[package]] name = "libdd-trace-normalization" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab12e095f3589d02ceed76556e7aa8a1b5bc928a900e143b624e2331294e54b5" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", "libdd-trace-protobuf 3.0.1", ] +[[package]] +name = "libdd-trace-obfuscation" +version = "2.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" +dependencies = [ + "anyhow", + "fluent-uri", + "libdd-common", + "libdd-trace-protobuf 3.0.1", + "libdd-trace-utils", + "log", + "percent-encoding", + "serde", + "serde_json", +] + [[package]] name = "libdd-trace-protobuf" version = "2.0.0" @@ -823,8 +926,7 @@ dependencies = [ [[package]] name = "libdd-trace-protobuf" version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1809242895edc53ac51a21287829f42474e749dbc222ea7f414cb3f0d1f91d4e" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "prost", "serde", @@ -834,34 +936,49 @@ dependencies = [ [[package]] name = "libdd-trace-stats" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92b882863f7c531d51e73f7bc5930c705e47829332128d9bdcad0fea3b2b942" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ + "anyhow", + "async-trait", "hashbrown 0.15.5", + "http", + "libdd-capabilities", + "libdd-capabilities-impl", + "libdd-common", "libdd-ddsketch", + "libdd-shared-runtime", + "libdd-trace-obfuscation", "libdd-trace-protobuf 3.0.1", "libdd-trace-utils", + "rmp-serde", + "serde", + "tokio", + "tokio-util", + "tracing", ] [[package]] name = "libdd-trace-utils" version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870506e9bb79c93ce5bbfe9d715c53c7ea393a177c7299f0bf43745c0adea0c7" +source = "git+https://github.com/DataDog/libdatadog?tag=v33.0.0#37d17ee71ae396782242d45e1b31af2887bbbbd3" dependencies = [ "anyhow", + "base64 0.22.1", "bytes", "futures", + "getrandom 0.2.17", "http", "http-body", "http-body-util", "indexmap", + "libdd-capabilities", + "libdd-capabilities-impl", "libdd-common", "libdd-tinybytes", "libdd-trace-normalization", "libdd-trace-protobuf 3.0.1", "prost", - "rand 0.8.5", + "rand 0.8.6", "rmp", "rmp-serde", "rmpv", @@ -998,18 +1115,18 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", @@ -1096,9 +1213,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -1153,6 +1270,26 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "regex" version = "1.12.3" @@ -1306,6 +1443,7 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ + "indexmap", "itoa", "memchr", "serde", @@ -1463,9 +1601,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.51.1" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f66bf9585cda4b724d3e78ab34b73fb2bbaba9011b9bfdf69dc836382ea13b8c" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", @@ -1607,9 +1745,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "unicode-ident" @@ -1631,9 +1769,9 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "uuid" -version = "1.23.0" +version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" +checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" dependencies = [ "getrandom 0.4.2", "js-sys", @@ -1669,11 +1807,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" +version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", ] [[package]] @@ -1682,14 +1820,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.51.0", ] [[package]] name = "wasm-bindgen" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" +checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" dependencies = [ "cfg-if", "once_cell", @@ -1700,9 +1838,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" +checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1710,9 +1848,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" +checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" dependencies = [ "bumpalo", "proc-macro2", @@ -1723,9 +1861,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" +checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" dependencies = [ "unicode-ident", ] @@ -1936,6 +2074,12 @@ dependencies = [ "wit-bindgen-rust-macro", ] +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + [[package]] name = "wit-bindgen-core" version = "0.51.0" diff --git a/instrumentation/Cargo.toml b/instrumentation/Cargo.toml index 55c9c8d7..4f49bbbd 100644 --- a/instrumentation/Cargo.toml +++ b/instrumentation/Cargo.toml @@ -22,3 +22,4 @@ opentelemetry_sdk = { version = "0.31.0", default-features = false } opentelemetry-semantic-conventions = { version = "0.31.0", features = ["semconv_experimental"] } tracing = { version = "0.1", default-features = false } tokio = { version = "1.44.1" } +