Skip to content

[SVLS-8799] Update libdatadog revision #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kathiehuang wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[SVLS-8799] Update libdatadog revision #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c07a854
Update libdatadog rev
kathiehuang Apr 16, 2026
04b5bd8
Update rustls-native-certs
kathiehuang Apr 16, 2026
4aed11c
Update stats_flusher to use DefaultHttpClient
kathiehuang Apr 16, 2026
7aa4aa7
Adapt trace flusher to the new trait-based API
kathiehuang Apr 17, 2026
9e4bf3c
Rename try_new to with_proxy
kathiehuang Apr 17, 2026
aa394d0
Add FUNCTION_TARGET to unit tests, update license, update rustls-webpki
kathiehuang Apr 17, 2026
ac26f93
Update license
kathiehuang Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 59 additions & 31 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ js-sys,https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/js-sys,MI
lazy_static,https://github.com/rust-lang-nursery/lazy-static.rs,MIT OR Apache-2.0,Marvin Löbel <loebel.marvin@gmail.com>
leb128fmt,https://github.com/bluk/leb128fmt,MIT OR Apache-2.0,Bryant Luk <code@bryantluk.com>
libc,https://github.com/rust-lang/libc,MIT OR Apache-2.0,The Rust Project Developers
libdd-capabilities,https://github.com/DataDog/libdatadog/tree/main/libdd-capabilities,Apache-2.0,The libdd-capabilities Authors
libdd-capabilities-impl,https://github.com/DataDog/libdatadog/tree/main/libdd-capabilities-impl,Apache-2.0,The libdd-capabilities-impl Authors
libdd-common,https://github.com/DataDog/libdatadog/tree/main/datadog-common,Apache-2.0,The libdd-common Authors
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
Expand Down Expand Up @@ -148,7 +150,7 @@ nom,https://github.com/Geal/nom,MIT,contact@geoffroycouprie.com
nu-ansi-term,https://github.com/nushell/nu-ansi-term,MIT,"ogham@bsago.me, Ryan Scheel (Havvy) <ryan.havvy@gmail.com>, Josh Triplett <josh@joshtriplett.org>, The Nushell Project Developers"
num-traits,https://github.com/rust-num/num-traits,MIT OR Apache-2.0,The Rust Project Developers
once_cell,https://github.com/matklad/once_cell,MIT OR Apache-2.0,Aleksey Kladov <aleksey.kladov@gmail.com>
openssl-probe,https://github.com/rustls/openssl-probe,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
openssl-probe,https://github.com/alexcrichton/openssl-probe,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
opentelemetry,https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry,Apache-2.0,The opentelemetry Authors
opentelemetry-semantic-conventions,https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-semantic-conventions,Apache-2.0,The opentelemetry-semantic-conventions Authors
opentelemetry_sdk,https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-sdk,Apache-2.0,The opentelemetry_sdk Authors
Expand Down
4 changes: 2 additions & 2 deletions crates/datadog-agent-config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "8c88979985154d6d97c0fc2ca9039682981eacad" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
log = { version = "0.4", default-features = false }
serde = { version = "1.0", default-features = false, features = ["derive"] }
serde-aux = { version = "4.7", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion crates/datadog-fips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository.workspace = true
[dependencies]
reqwest = { version = "0.12.4", features = ["json", "http2"], default-features = false }
rustls = { version = "0.23.18", default-features = false, features = ["fips"], optional = true }
rustls-native-certs = { version = "0.8.1", optional = true }
rustls-native-certs = { version = ">=0.8.1, <0.8.3", optional = true }
tracing = { version = "0.1.40", default-features = false }

[features]
Expand Down
2 changes: 1 addition & 1 deletion crates/datadog-serverless-compat/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "8c88979985154d6d97c0fc2ca9039682981eacad" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
datadog-fips = { path = "../datadog-fips", default-features = false }
dogstatsd = { path = "../dogstatsd", default-features = true }
reqwest = { version = "0.12.4", default-features = false }
Expand Down
11 changes: 6 additions & 5 deletions crates/datadog-trace-agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ async-trait = "0.1.64"
tracing = { version = "0.1", default-features = false }
serde = { version = "1.0.145", features = ["derive"] }
serde_json = "1.0"
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad", features = [
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665", features = [
"mini_agent",
] }
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
datadog-fips = { path = "../datadog-fips" }
reqwest = { version = "0.12.23", features = ["json", "http2"], default-features = false }
bytes = "1.10.1"
Expand All @@ -40,6 +41,6 @@ serial_test = "2.0.0"
duplicate = "0.4.1"
temp-env = "0.3.6"
tempfile = "3.3.0"
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad", features = [
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665", features = [
"test-utils",
] }
4 changes: 4 additions & 0 deletions crates/datadog-trace-agent/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ mod tests {
[
("DD_API_KEY", Some("_not_a_real_key_")),
("K_SERVICE", Some("function_name")),
("FUNCTION_TARGET", Some("function_target")),
],
|| {
let config_res = config::Config::new();
Expand Down Expand Up @@ -329,6 +330,7 @@ mod tests {
[
("DD_API_KEY", Some("_not_a_real_key_")),
("K_SERVICE", Some("function_name")),
("FUNCTION_TARGET", Some("function_target")),
("DD_SITE", Some(dd_site)),
],
|| {
Expand Down Expand Up @@ -356,6 +358,7 @@ mod tests {
[
("DD_API_KEY", Some("_not_a_real_key_")),
("K_SERVICE", Some("function_name")),
("FUNCTION_TARGET", Some("function_target")),
("DD_SITE", Some(dd_site)),
],
|| {
Expand All @@ -374,6 +377,7 @@ mod tests {
[
("DD_API_KEY", Some("_not_a_real_key_")),
("K_SERVICE", Some("function_name")),
("FUNCTION_TARGET", Some("function_target")),
("DD_APM_DD_URL", Some("http://127.0.0.1:3333")),
],
|| {
Expand Down
3 changes: 2 additions & 1 deletion crates/datadog-trace-agent/src/stats_flusher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

use async_trait::async_trait;
use libdd_common::DefaultHttpClient;
use std::{sync::Arc, time};
use tokio::sync::{Mutex, mpsc::Receiver};
use tracing::{debug, error};
Expand Down Expand Up @@ -76,7 +77,7 @@ impl StatsFlusher for ServerlessStatsFlusher {
};

#[allow(clippy::unwrap_used)]
match stats_utils::send_stats_payload(
match stats_utils::send_stats_payload::<DefaultHttpClient>(
serialized_stats_payload,
&config.trace_stats_intake,
config.trace_stats_intake.api_key.as_ref().unwrap(),
Expand Down
Loading
Loading