Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 19 additions & 14 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions crates/datadog-agent-config/Cargo.toml
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 = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
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-metrics-collector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = "Collector to read, compute, and submit enhanced metrics in Server
[dependencies]
dogstatsd = { path = "../dogstatsd", default-features = true }
tracing = { version = "0.1", default-features = false }
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0", default-features = false }
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81", default-features = false }

[dev-dependencies]
tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/datadog-serverless-compat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ windows-enhanced-metrics = ["datadog-metrics-collector/windows-enhanced-metrics"
datadog-logs-agent = { path = "../datadog-logs-agent" }
datadog-metrics-collector = { path = "../datadog-metrics-collector" }
datadog-trace-agent = { path = "../datadog-trace-agent" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
datadog-fips = { path = "../datadog-fips", default-features = false }
dogstatsd = { path = "../dogstatsd", default-features = true }
reqwest = { version = "0.12.4", default-features = false }
Expand Down
18 changes: 9 additions & 9 deletions crates/datadog-trace-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ tracing = { version = "0.1", default-features = false }
serde = { version = "1.0.145", features = ["derive"] }
serde_json = "1.0"
thiserror = { version = "1.0.58", default-features = false }
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-capabilities-impl = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0", features = [
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
libdd-capabilities-impl = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81", features = [
"mini_agent",
] }
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "4ae8ebe252451374c292efd159ce254c3f5a72e0" }
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81" }
datadog-fips = { path = "../datadog-fips" }
reqwest = { version = "0.12.23", features = [
"json",
Expand All @@ -49,6 +49,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 = "4ae8ebe252451374c292efd159ce254c3f5a72e0", features = [
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "0a3304c6aaf84738786b670d706a01edc22dab81", features = [
"test-utils",
] }
4 changes: 2 additions & 2 deletions crates/datadog-trace-agent/src/stats_flusher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

use async_trait::async_trait;
use libdd_capabilities_impl::DefaultHttpClient;
use libdd_capabilities_impl::NativeHttpClient;
use std::{sync::Arc, time};
use tokio::sync::mpsc::Receiver;
use tokio::sync::oneshot;
Expand All @@ -25,7 +25,7 @@ async fn send_stats_payload(config: &Arc<Config>, payload: pb::StatsPayload) {
}
};
#[allow(clippy::unwrap_used)]
match stats_utils::send_stats_payload::<DefaultHttpClient>(
match stats_utils::send_stats_payload::<NativeHttpClient>(
serialized,
&config.trace_stats_intake,
config.trace_stats_intake.api_key.as_ref().unwrap(),
Expand Down
21 changes: 18 additions & 3 deletions crates/datadog-trace-agent/src/trace_flusher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ use tokio::sync::{Mutex, mpsc::Receiver};
use tracing::{debug, error};

use http_body_util::BodyExt;
use libdd_capabilities::http::{HttpClientTrait, HttpError};
use libdd_capabilities::{MaybeSend, Request, Response};
use libdd_capabilities::http::{HttpClientCapability, HttpError};
use libdd_capabilities::{MaybeSend, Request, Response, SleepCapability};
use libdd_capabilities_impl::NativeSleepCapability;
use libdd_common::connector::Connector;
use libdd_common::http_common::{self, Body, GenericHttpClient};
use libdd_trace_utils::trace_utils;
Expand Down Expand Up @@ -132,7 +133,7 @@ impl ProxyHttpClient {
}
}

impl HttpClientTrait for ProxyHttpClient {
impl HttpClientCapability for ProxyHttpClient {
#[allow(clippy::expect_used)]
fn new_client() -> Self {
Self::with_proxy(None).expect("building proxy connector with default TLS should not fail")
Expand Down Expand Up @@ -160,3 +161,17 @@ impl HttpClientTrait for ProxyHttpClient {
}
}
}

impl SleepCapability for ProxyHttpClient {
#[allow(clippy::expect_used)]
fn new() -> Self {
Self::with_proxy(None).expect("building proxy connector with default TLS should not fail")
}

fn sleep(
&self,
duration: std::time::Duration,
) -> impl std::future::Future<Output = ()> + MaybeSend {
NativeSleepCapability.sleep(duration)
}
}
Loading