Skip to content

Commit 66c23a5

Browse files
duncanistaduncanista
committed
upgrade libdatadog deps
1 parent d9e19a7 commit 66c23a5

10 files changed

Lines changed: 119 additions & 150 deletions

File tree

‎bottlecap/Cargo.lock‎

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

‎bottlecap/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ indexmap = {version = "2.11.0", default-features = false}
6767
# be found in the clippy.toml file adjacent to this Cargo.toml.
6868
datadog-protos = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "f863626dbfe3c59bb390985fa6530b0621c2a0a2"}
6969
ddsketch-agent = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "f863626dbfe3c59bb390985fa6530b0621c2a0a2"}
70-
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "158b59471f1132e3cb36023fa3c46ccb2dd0eda1" }
71-
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "158b59471f1132e3cb36023fa3c46ccb2dd0eda1" }
72-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "158b59471f1132e3cb36023fa3c46ccb2dd0eda1" , features = ["mini_agent"] }
73-
libdd-trace-normalization = { git = "https://github.com/DataDog/libdatadog", rev = "158b59471f1132e3cb36023fa3c46ccb2dd0eda1" }
74-
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "158b59471f1132e3cb36023fa3c46ccb2dd0eda1" }
75-
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "158b59471f1132e3cb36023fa3c46ccb2dd0eda1" }
70+
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "c8121f422d2c8d219f8d421ff3cdb1fcbe9e8b09" }
71+
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "c8121f422d2c8d219f8d421ff3cdb1fcbe9e8b09" }
72+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "c8121f422d2c8d219f8d421ff3cdb1fcbe9e8b09" , features = ["mini_agent"] }
73+
libdd-trace-normalization = { git = "https://github.com/DataDog/libdatadog", rev = "c8121f422d2c8d219f8d421ff3cdb1fcbe9e8b09" }
74+
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "c8121f422d2c8d219f8d421ff3cdb1fcbe9e8b09" }
75+
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "c8121f422d2c8d219f8d421ff3cdb1fcbe9e8b09" }
7676
dogstatsd = { git = "https://github.com/DataDog/serverless-components", rev = "2eb009a59ed07ffcaf174db1c31af413365e9bc6", default-features = false }
7777
datadog-fips = { git = "https://github.com/DataDog/serverless-components", rev = "2eb009a59ed07ffcaf174db1c31af413365e9bc6", default-features = false }
7878
libddwaf = { version = "1.28.1", git = "https://github.com/DataDog/libddwaf-rust", rev = "d1534a158d976bd4f747bf9fcc58e0712d2d17fc", default-features = false, features = ["serde"] }

bottlecap/src/traces/hyper_client.rs renamed to bottlecap/src/traces/http_client.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Copyright 2023-Present Datadog, Inc. https://www.datadoghq.com/
22
// SPDX-License-Identifier: Apache-2.0
33

4-
//! Hyper-based HTTP client for trace and stats flushers.
4+
//! HTTP client for trace and stats flushers.
55
//!
66
//! This module provides the HTTP client type required by `libdd_trace_utils`
77
//! for sending traces and stats to Datadog intake endpoints.
88
99
use hyper_http_proxy;
1010
use hyper_rustls::HttpsConnectorBuilder;
11-
use libdd_common::{GenericHttpClient, hyper_migration};
11+
use libdd_common::{GenericHttpClient, http_common};
1212
use rustls::RootCertStore;
1313
use rustls_pki_types::CertificateDer;
1414
use std::error::Error;
@@ -20,7 +20,7 @@ use tracing::debug;
2020
/// Type alias for the HTTP client used by trace and stats flushers.
2121
///
2222
/// This is the client type expected by `libdd_trace_utils::SendData::send()`.
23-
pub type HyperClient =
23+
pub type HttpClient =
2424
GenericHttpClient<hyper_http_proxy::ProxyConnector<libdd_common::connector::Connector>>;
2525

2626
/// Initialize the crypto provider needed for setting custom root certificates.
@@ -35,7 +35,7 @@ fn ensure_crypto_provider_initialized() {
3535
let () = &*INIT_CRYPTO_PROVIDER;
3636
}
3737

38-
/// Creates a new hyper-based HTTP client with the given configuration.
38+
/// Creates a new HTTP client with the given configuration.
3939
///
4040
/// This client is compatible with `libdd_trace_utils` and supports:
4141
/// - HTTPS proxy configuration
@@ -54,7 +54,7 @@ fn ensure_crypto_provider_initialized() {
5454
pub fn create_client(
5555
proxy_https: Option<&String>,
5656
tls_cert_file: Option<&String>,
57-
) -> Result<HyperClient, Box<dyn Error>> {
57+
) -> Result<HttpClient, Box<dyn Error>> {
5858
// Create the base connector with optional custom TLS config
5959
let connector = if let Some(ca_cert_path) = tls_cert_file {
6060
// Ensure crypto provider is initialized before creating TLS config
@@ -84,10 +84,7 @@ pub fn create_client(
8484
.enable_http1()
8585
.build();
8686

87-
debug!(
88-
"HYPER_CLIENT | Added root certificate from {}",
89-
ca_cert_path
90-
);
87+
debug!("HTTP_CLIENT | Added root certificate from {}", ca_cert_path);
9188

9289
// Construct the Connector::Https variant directly
9390
libdd_common::connector::Connector::Https(https_connector)
@@ -100,14 +97,14 @@ pub fn create_client(
10097
let proxy =
10198
hyper_http_proxy::Proxy::new(hyper_http_proxy::Intercept::Https, proxy.parse()?);
10299
let proxy_connector = hyper_http_proxy::ProxyConnector::from_proxy(connector, proxy)?;
103-
let client = hyper_migration::client_builder().build(proxy_connector);
100+
let client = http_common::client_builder().build(proxy_connector);
104101
debug!(
105-
"HYPER_CLIENT | Proxy connector created with proxy: {:?}",
102+
"HTTP_CLIENT | Proxy connector created with proxy: {:?}",
106103
proxy_https
107104
);
108105
Ok(client)
109106
} else {
110107
let proxy_connector = hyper_http_proxy::ProxyConnector::new(connector)?;
111-
Ok(hyper_migration::client_builder().build(proxy_connector))
108+
Ok(http_common::client_builder().build(proxy_connector))
112109
}
113110
}

‎bottlecap/src/traces/mod.rs‎

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

44
pub mod context;
5-
pub mod hyper_client;
5+
pub mod http_client;
66
pub mod propagation;
77
pub mod proxy_aggregator;
88
pub mod proxy_flusher;

‎bottlecap/src/traces/stats_flusher.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use tokio::sync::OnceCell;
88

99
use crate::config;
1010
use crate::lifecycle::invocation::processor::S_TO_MS;
11-
use crate::traces::hyper_client::{self, HyperClient};
11+
use crate::traces::http_client::{self, HttpClient};
1212
use crate::traces::stats_aggregator::StatsAggregator;
1313
use dogstatsd::api_key::ApiKeyFactory;
1414
use libdd_common::Endpoint;
@@ -24,7 +24,7 @@ pub struct StatsFlusher {
2424
/// Cached HTTP client, lazily initialized on first use.
2525
/// TODO: `StatsFlusher` and `TraceFlusher` both hit trace.agent.datadoghq.{site} and could
2626
/// share a single HTTP client for better connection pooling.
27-
http_client: OnceCell<HyperClient>,
27+
http_client: OnceCell<HttpClient>,
2828
}
2929

3030
impl StatsFlusher {
@@ -72,6 +72,7 @@ impl StatsFlusher {
7272
api_key: Some(api_key_clone.into()),
7373
timeout_ms: self.config.flush_timeout * S_TO_MS,
7474
test_token: None,
75+
use_system_resolver: false,
7576
}
7677
}
7778
})
@@ -176,11 +177,11 @@ impl StatsFlusher {
176177
///
177178
/// Returns `None` if client creation fails. The error is logged but not cached,
178179
/// allowing retry on subsequent calls.
179-
async fn get_or_init_http_client(&self) -> Option<&HyperClient> {
180+
async fn get_or_init_http_client(&self) -> Option<&HttpClient> {
180181
match self
181182
.http_client
182183
.get_or_try_init(|| async {
183-
hyper_client::create_client(
184+
http_client::create_client(
184185
self.config.proxy_https.as_ref(),
185186
self.config.tls_cert_file.as_ref(),
186187
)

‎bottlecap/src/traces/stats_processor.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ use axum::{
1212
use tokio::sync::mpsc::Sender;
1313
use tracing::{debug, error};
1414

15-
use libdd_common::hyper_migration;
15+
use libdd_common::http_common;
1616
use libdd_trace_protobuf::pb;
1717
use libdd_trace_utils::stats_utils;
1818

19-
use super::trace_agent::MAX_CONTENT_LENGTH;
19+
use crate::traces::trace_agent::MAX_CONTENT_LENGTH;
2020
use crate::http::extract_request_body;
2121

2222
#[async_trait]
@@ -66,7 +66,7 @@ impl StatsProcessor for ServerlessStatsProcessor {
6666
// deserialize trace stats from the request body, convert to protobuf structs (see
6767
// trace-protobuf crate)
6868
let mut stats: pb::ClientStatsPayload =
69-
match stats_utils::get_stats_from_request_body(hyper_migration::Body::from_bytes(body))
69+
match stats_utils::get_stats_from_request_body(http_common::Body::from_bytes(body))
7070
.await
7171
{
7272
Ok(result) => result,

‎bottlecap/src/traces/trace_agent.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use crate::{
4343
trace_processor,
4444
},
4545
};
46-
use libdd_common::hyper_migration;
46+
use libdd_common::http_common;
4747
use libdd_trace_protobuf::pb;
4848
use libdd_trace_utils::trace_utils::{self};
4949

@@ -503,22 +503,22 @@ impl TraceAgent {
503503

504504
let tracer_header_tags = (&parts.headers).into();
505505

506-
let (body_size, mut traces) = match version {
507-
ApiVersion::V04 => match trace_utils::get_traces_from_request_body(
508-
hyper_migration::Body::from_bytes(body),
509-
)
510-
.await
511-
{
512-
Ok(result) => result,
513-
Err(err) => {
514-
return error_response(
515-
StatusCode::INTERNAL_SERVER_ERROR,
516-
format!("Error deserializing trace from request body: {err}"),
517-
);
506+
let (body_size, mut traces): (usize, Vec<Vec<pb::Span>>) = match version {
507+
ApiVersion::V04 => {
508+
match trace_utils::get_traces_from_request_body(http_common::Body::from_bytes(body))
509+
.await
510+
{
511+
Ok(result) => result,
512+
Err(err) => {
513+
return error_response(
514+
StatusCode::INTERNAL_SERVER_ERROR,
515+
format!("Error deserializing trace from request body: {err}"),
516+
);
517+
}
518518
}
519-
},
519+
}
520520
ApiVersion::V05 => match trace_utils::get_v05_traces_from_request_body(
521-
hyper_migration::Body::from_bytes(body),
521+
http_common::Body::from_bytes(body),
522522
)
523523
.await
524524
{

‎bottlecap/src/traces/trace_aggregator.rs‎

Lines changed: 14 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ mod tests {
9595

9696
use super::*;
9797

98-
#[test]
99-
fn test_add() {
100-
let mut aggregator = TraceAggregator::default();
98+
fn make_builder(size: usize) -> SendDataBuilder {
10199
let tracer_header_tags = TracerHeaderTags {
102100
lang: "lang",
103101
lang_version: "lang_version",
@@ -110,42 +108,29 @@ mod tests {
110108
dropped_p0_traces: 0,
111109
dropped_p0_spans: 0,
112110
};
113-
let size = 1;
114-
let payload = SendDataBuilder::new(
111+
SendDataBuilder::new(
115112
size,
116113
TracerPayloadCollection::V07(Vec::new()),
117114
tracer_header_tags,
118115
&Endpoint::from_slice("localhost"),
119-
);
116+
)
117+
}
120118

121-
aggregator.add(SendDataBuilderInfo::new(payload.clone(), size));
119+
#[test]
120+
fn test_add() {
121+
let mut aggregator = TraceAggregator::default();
122+
let size = 1;
123+
124+
aggregator.add(SendDataBuilderInfo::new(make_builder(size), size));
122125
assert_eq!(aggregator.queue.len(), 1);
123126
}
124127

125128
#[test]
126129
fn test_get_batch() {
127130
let mut aggregator = TraceAggregator::default();
128-
let tracer_header_tags = TracerHeaderTags {
129-
lang: "lang",
130-
lang_version: "lang_version",
131-
lang_interpreter: "lang_interpreter",
132-
lang_vendor: "lang_vendor",
133-
tracer_version: "tracer_version",
134-
container_id: "container_id",
135-
client_computed_top_level: true,
136-
client_computed_stats: true,
137-
dropped_p0_traces: 0,
138-
dropped_p0_spans: 0,
139-
};
140131
let size = 1;
141-
let payload = SendDataBuilder::new(
142-
size,
143-
TracerPayloadCollection::V07(Vec::new()),
144-
tracer_header_tags,
145-
&Endpoint::from_slice("localhost"),
146-
);
147132

148-
aggregator.add(SendDataBuilderInfo::new(payload.clone(), size));
133+
aggregator.add(SendDataBuilderInfo::new(make_builder(size), size));
149134
assert_eq!(aggregator.queue.len(), 1);
150135
let batch = aggregator.get_batch();
151136
assert_eq!(batch.len(), 1);
@@ -154,30 +139,12 @@ mod tests {
154139
#[test]
155140
fn test_get_batch_full_entries() {
156141
let mut aggregator = TraceAggregator::new(2);
157-
let tracer_header_tags = TracerHeaderTags {
158-
lang: "lang",
159-
lang_version: "lang_version",
160-
lang_interpreter: "lang_interpreter",
161-
lang_vendor: "lang_vendor",
162-
tracer_version: "tracer_version",
163-
container_id: "container_id",
164-
client_computed_top_level: true,
165-
client_computed_stats: true,
166-
dropped_p0_traces: 0,
167-
dropped_p0_spans: 0,
168-
};
169142
let size = 1;
170-
let payload = SendDataBuilder::new(
171-
size,
172-
TracerPayloadCollection::V07(Vec::new()),
173-
tracer_header_tags,
174-
&Endpoint::from_slice("localhost"),
175-
);
176143

177144
// Add 3 payloads
178-
aggregator.add(SendDataBuilderInfo::new(payload.clone(), size));
179-
aggregator.add(SendDataBuilderInfo::new(payload.clone(), size));
180-
aggregator.add(SendDataBuilderInfo::new(payload.clone(), size));
145+
aggregator.add(SendDataBuilderInfo::new(make_builder(size), size));
146+
aggregator.add(SendDataBuilderInfo::new(make_builder(size), size));
147+
aggregator.add(SendDataBuilderInfo::new(make_builder(size), size));
181148

182149
// The batch should only contain the first 2 payloads
183150
let first_batch = aggregator.get_batch();

0 commit comments

Comments
 (0)