Skip to content

[SVLS-7945] feat: Support TLS certificate for dogstatsd metrics flusher #984

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

Merged
lym953 merged 3 commits into from
Jan 9, 2026
Merged

[SVLS-7945] feat: Support TLS certificate for dogstatsd metrics flusher #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab600bc
[SVLS-7945] feat: Support TLS certificate for dogstatsd metrics flusher
lym953 Jan 8, 2026
e041b26
Update serverless-components
lym953 Jan 9, 2026
946b555
Update test
lym953 Jan 9, 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
5 changes: 3 additions & 2 deletions bottlecap/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: 2 additions & 2 deletions bottlecap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "73c6
libdd-trace-normalization = { git = "https://github.com/DataDog/libdatadog", rev = "73c675b79f81978ee1190be6af0c5abec997e3b0" }
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "73c675b79f81978ee1190be6af0c5abec997e3b0" }
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "73c675b79f81978ee1190be6af0c5abec997e3b0" }
dogstatsd = { git = "https://github.com/DataDog/serverless-components", rev = "fd8b7a9bcec2f19b305bb74b7195ca3910538e5b", default-features = false }
datadog-fips = { git = "https://github.com/DataDog/serverless-components", rev = "fd8b7a9bcec2f19b305bb74b7195ca3910538e5b", default-features = false }
dogstatsd = { git = "https://github.com/DataDog/serverless-components", rev = "18b49baba8bfef97060d7edd8b830584d0da3373", default-features = false }
datadog-fips = { git = "https://github.com/DataDog/serverless-components", rev = "18b49baba8bfef97060d7edd8b830584d0da3373", default-features = false }
libddwaf = { version = "1.28.1", git = "https://github.com/DataDog/libddwaf-rust", rev = "d1534a158d976bd4f747bf9fcc58e0712d2d17fc", default-features = false, features = ["serde"] }

[dev-dependencies]
Expand Down
2 changes: 2 additions & 0 deletions bottlecap/src/bin/bottlecap/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1622,6 +1622,7 @@ fn start_metrics_flushers(
aggregator_handle: metrics_aggr_handle.clone(),
metrics_intake_url_prefix: metrics_intake_url.expect("can't parse site or override"),
https_proxy: config.proxy_https.clone(),
ca_cert_path: config.tls_cert_file.clone(),
timeout: Duration::from_secs(config.flush_timeout),
retry_strategy: DsdRetryStrategy::Immediate(3),
compression_level: config.metrics_config_compression_level,
Expand Down Expand Up @@ -1651,6 +1652,7 @@ fn start_metrics_flushers(
aggregator_handle: metrics_aggr_handle.clone(),
metrics_intake_url_prefix: metrics_intake_url.clone(),
https_proxy: config.proxy_https.clone(),
ca_cert_path: config.tls_cert_file.clone(),
timeout: Duration::from_secs(config.flush_timeout),
retry_strategy: DsdRetryStrategy::Immediate(3),
compression_level: config.metrics_config_compression_level,
Expand Down
1 change: 1 addition & 0 deletions bottlecap/tests/metrics_integration_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ async fn test_enhanced_metrics() {
metrics_intake_url_prefix: MetricsIntakeUrlPrefix::new(None, Some(metrics_site_override))
.expect("can't parse metrics intake URL from site"),
https_proxy: None,
ca_cert_path: None,
timeout: std::time::Duration::from_secs(5),
retry_strategy: dogstatsd::datadog::RetryStrategy::Immediate(1),
compression_level: 6,
Expand Down
Loading