Skip to content

Commit 17a516a

Browse files
kathiehuanglitianningdatadog
kathiehuang
authored and
litianningdatadog
committed
[SVLS-8799] Update libdatadog revision (#115)
* Update libdatadog rev * Update rustls-native-certs * Update stats_flusher to use DefaultHttpClient * Adapt trace flusher to the new trait-based API * Add FUNCTION_TARGET to unit tests, update license, update rustls-webpki
1 parent 40e228e commit 17a516a

9 files changed

Lines changed: 140 additions & 64 deletions

File tree

‎Cargo.lock‎

Lines changed: 56 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSE-3rdparty.csv‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ js-sys,https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/js-sys,MI
117117
lazy_static,https://github.com/rust-lang-nursery/lazy-static.rs,MIT OR Apache-2.0,Marvin Löbel <loebel.marvin@gmail.com>
118118
leb128fmt,https://github.com/bluk/leb128fmt,MIT OR Apache-2.0,Bryant Luk <code@bryantluk.com>
119119
libc,https://github.com/rust-lang/libc,MIT OR Apache-2.0,The Rust Project Developers
120+
libdd-capabilities,https://github.com/DataDog/libdatadog/tree/main/libdd-capabilities,Apache-2.0,The libdd-capabilities Authors
121+
libdd-capabilities-impl,https://github.com/DataDog/libdatadog/tree/main/libdd-capabilities-impl,Apache-2.0,The libdd-capabilities-impl Authors
120122
libdd-common,https://github.com/DataDog/libdatadog/tree/main/datadog-common,Apache-2.0,The libdd-common Authors
121123
libdd-data-pipeline,https://github.com/DataDog/libdatadog/tree/main/libdd-data-pipeline,Apache-2.0,The libdd-data-pipeline Authors
122124
libdd-ddsketch,https://github.com/DataDog/libdatadog/tree/main/libdd-ddsketch,Apache-2.0,The libdd-ddsketch Authors
@@ -147,7 +149,7 @@ nom,https://github.com/Geal/nom,MIT,contact@geoffroycouprie.com
147149
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"
148150
num-traits,https://github.com/rust-num/num-traits,MIT OR Apache-2.0,The Rust Project Developers
149151
once_cell,https://github.com/matklad/once_cell,MIT OR Apache-2.0,Aleksey Kladov <aleksey.kladov@gmail.com>
150-
openssl-probe,https://github.com/rustls/openssl-probe,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
152+
openssl-probe,https://github.com/alexcrichton/openssl-probe,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
151153
opentelemetry,https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry,Apache-2.0,The opentelemetry Authors
152154
opentelemetry-semantic-conventions,https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-semantic-conventions,Apache-2.0,The opentelemetry-semantic-conventions Authors
153155
opentelemetry_sdk,https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-sdk,Apache-2.0,The opentelemetry_sdk Authors

‎crates/datadog-agent-config/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ license.workspace = true
66

77
[dependencies]
88
figment = { version = "0.10", default-features = false, features = ["yaml", "env"] }
9-
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
10-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
9+
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
10+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
1111
log = { version = "0.4", default-features = false }
1212
serde = { version = "1.0", default-features = false, features = ["derive"] }
1313
serde-aux = { version = "4.7", default-features = false }

‎crates/datadog-fips/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repository.workspace = true
99
[dependencies]
1010
reqwest = { version = "0.12.4", features = ["json", "http2"], default-features = false }
1111
rustls = { version = "0.23.18", default-features = false, features = ["fips"], optional = true }
12-
rustls-native-certs = { version = "0.8.1", optional = true }
12+
rustls-native-certs = { version = ">=0.8.1, <0.8.3", optional = true }
1313
tracing = { version = "0.1.40", default-features = false }
1414

1515
[features]

‎crates/datadog-serverless-compat/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ windows-pipes = ["datadog-trace-agent/windows-pipes", "dogstatsd/windows-pipes"]
1212
[dependencies]
1313
datadog-logs-agent = { path = "../datadog-logs-agent" }
1414
datadog-trace-agent = { path = "../datadog-trace-agent" }
15-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
15+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
1616
datadog-fips = { path = "../datadog-fips", default-features = false }
1717
dogstatsd = { path = "../dogstatsd", default-features = true }
1818
reqwest = { version = "0.12.4", default-features = false }

‎crates/datadog-trace-agent/Cargo.toml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ async-trait = "0.1.64"
2424
tracing = { version = "0.1", default-features = false }
2525
serde = { version = "1.0.145", features = ["derive"] }
2626
serde_json = "1.0"
27-
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
28-
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
29-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad", features = [
27+
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
28+
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
29+
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
30+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665", features = [
3031
"mini_agent",
3132
] }
32-
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad" }
33+
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665" }
3334
datadog-fips = { path = "../datadog-fips" }
3435
reqwest = { version = "0.12.23", features = ["json", "http2"], default-features = false }
3536
bytes = "1.10.1"
@@ -40,6 +41,6 @@ serial_test = "2.0.0"
4041
duplicate = "2.0.1"
4142
temp-env = "0.3.6"
4243
tempfile = "3.3.0"
43-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "8c88979985154d6d97c0fc2ca9039682981eacad", features = [
44+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "986aab55cb7941d8453dffb59d35a70599d08665", features = [
4445
"test-utils",
4546
] }

‎crates/datadog-trace-agent/src/config.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ mod tests {
296296
[
297297
("DD_API_KEY", Some("_not_a_real_key_")),
298298
("K_SERVICE", Some("function_name")),
299+
("FUNCTION_TARGET", Some("function_target")),
299300
],
300301
|| {
301302
let config_res = config::Config::new();
@@ -329,6 +330,7 @@ mod tests {
329330
[
330331
("DD_API_KEY", Some("_not_a_real_key_")),
331332
("K_SERVICE", Some("function_name")),
333+
("FUNCTION_TARGET", Some("function_target")),
332334
("DD_SITE", Some(dd_site)),
333335
],
334336
|| {
@@ -356,6 +358,7 @@ mod tests {
356358
[
357359
("DD_API_KEY", Some("_not_a_real_key_")),
358360
("K_SERVICE", Some("function_name")),
361+
("FUNCTION_TARGET", Some("function_target")),
359362
("DD_SITE", Some(dd_site)),
360363
],
361364
|| {
@@ -374,6 +377,7 @@ mod tests {
374377
[
375378
("DD_API_KEY", Some("_not_a_real_key_")),
376379
("K_SERVICE", Some("function_name")),
380+
("FUNCTION_TARGET", Some("function_target")),
377381
("DD_APM_DD_URL", Some("http://127.0.0.1:3333")),
378382
],
379383
|| {

‎crates/datadog-trace-agent/src/stats_flusher.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
use async_trait::async_trait;
5+
use libdd_common::DefaultHttpClient;
56
use std::{sync::Arc, time};
67
use tokio::sync::{Mutex, mpsc::Receiver};
78
use tracing::{debug, error};
@@ -76,7 +77,7 @@ impl StatsFlusher for ServerlessStatsFlusher {
7677
};
7778

7879
#[allow(clippy::unwrap_used)]
79-
match stats_utils::send_stats_payload(
80+
match stats_utils::send_stats_payload::<DefaultHttpClient>(
8081
serialized_stats_payload,
8182
&config.trace_stats_intake,
8283
config.trace_stats_intake.api_key.as_ref().unwrap(),

0 commit comments

Comments
 (0)