Skip to content

chore: Upgrade libdatadog #964

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 4 commits into from
Dec 15, 2025
Merged

chore: Upgrade libdatadog #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d231374
chore: Upgrade libdatadog
lym953 Dec 10, 2025
77eef6c
fmt
lym953 Dec 12, 2025
c8b09ad
Use latest SHA
lym953 Dec 12, 2025
316a17c
Update license
lym953 Dec 12, 2025
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
50 changes: 25 additions & 25 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.

12 changes: 6 additions & 6 deletions bottlecap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ indexmap = {version = "2.11.0", default-features = false}
# be found in the clippy.toml file adjacent to this Cargo.toml.
datadog-protos = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "c89b58e5784b985819baf11f13f7d35876741222"}
ddsketch-agent = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "c89b58e5784b985819baf11f13f7d35876741222"}
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "7540423559548ce049c5424599d28ee1731378e8" }
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "7540423559548ce049c5424599d28ee1731378e8" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "7540423559548ce049c5424599d28ee1731378e8" , features = ["mini_agent"] }
libdd-trace-normalization = { git = "https://github.com/DataDog/libdatadog", rev = "7540423559548ce049c5424599d28ee1731378e8" }
datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "7540423559548ce049c5424599d28ee1731378e8" }
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "7540423559548ce049c5424599d28ee1731378e8" }
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "73c675b79f81978ee1190be6af0c5abec997e3b0" }
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "73c675b79f81978ee1190be6af0c5abec997e3b0" }
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "73c675b79f81978ee1190be6af0c5abec997e3b0" , features = ["mini_agent"] }
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 = "502f005c56b8d51dee95424a9c1404df46e2aae4", default-features = false }
datadog-fips = { git = "https://github.com/DataDog/serverless-components", rev = "502f005c56b8d51dee95424a9c1404df46e2aae4", default-features = false }
libddwaf = { version = "1.28.1", git = "https://github.com/DataDog/libddwaf-rust", rev = "d1534a158d976bd4f747bf9fcc58e0712d2d17fc", default-features = false, features = ["serde"] }
Expand Down
2 changes: 1 addition & 1 deletion bottlecap/LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ crc32fast,https://github.com/srijs/rust-crc32fast,MIT OR Apache-2.0,"Sam Rijs <s
crypto-common,https://github.com/RustCrypto/traits,MIT OR Apache-2.0,RustCrypto Developers
datadog-fips,https://github.com/DataDog/serverless-components,Apache-2.0,The datadog-fips Authors
datadog-protos,https://github.com/DataDog/saluki,Apache-2.0,The datadog-protos Authors
datadog-trace-obfuscation,https://github.com/DataDog/libdatadog,Apache-2.0,David Lee <[email protected]>
ddsketch-agent,https://github.com/DataDog/saluki,Apache-2.0,The ddsketch-agent Authors
deranged,https://github.com/jhpratt/deranged,MIT OR Apache-2.0,Jacob Pratt <[email protected]>
derive_more,https://github.com/JelteF/derive_more,MIT,Jelte Fennema <[email protected]>
Expand Down Expand Up @@ -103,6 +102,7 @@ libdd-common,https://github.com/DataDog/libdatadog/tree/main/datadog-common,Apac
libdd-ddsketch,https://github.com/DataDog/libdatadog/tree/main/libdd-ddsketch,Apache-2.0,The libdd-ddsketch Authors
libdd-tinybytes,https://github.com/DataDog/libdatadog/tree/main/libdd-tinybytes,Apache-2.0,The libdd-tinybytes Authors
libdd-trace-normalization,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-normalization,Apache-2.0,David Lee <[email protected]>
libdd-trace-obfuscation,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-obfuscation,Apache-2.0,Datadog Inc. <[email protected]>
libdd-trace-protobuf,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-protobuf,Apache-2.0,The libdd-trace-protobuf Authors
libdd-trace-stats,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-stats,Apache-2.0,The libdd-trace-stats Authors
libdd-trace-utils,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-utils,Apache-2.0,The libdd-trace-utils Authors
Expand Down
2 changes: 1 addition & 1 deletion bottlecap/src/bin/bottlecap/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ use bottlecap::{
};
use datadog_fips::reqwest_adapter::create_reqwest_client_builder;
use datadog_protos::metrics::SketchPayload;
use datadog_trace_obfuscation::obfuscation_config;
use decrypt::resolve_secrets;
use dogstatsd::{
aggregator_service::AggregatorHandle as MetricsAggregatorHandle,
Expand All @@ -93,6 +92,7 @@ use dogstatsd::{
flusher::{Flusher as MetricsFlusher, FlusherConfig as MetricsFlusherConfig},
metric::{EMPTY_TAGS, SortedTags},
};
use libdd_trace_obfuscation::obfuscation_config;
use libdd_trace_utils::send_data::SendData;
use reqwest::Client;
use std::{collections::hash_map, env, path::Path, str::FromStr, sync::Arc};
Expand Down
2 changes: 1 addition & 1 deletion bottlecap/src/config/apm_replace_rule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use datadog_trace_obfuscation::replacer::{ReplaceRule, parse_rules_from_string};
use libdd_trace_obfuscation::replacer::{ReplaceRule, parse_rules_from_string};
use serde::de::{Deserializer, SeqAccess, Visitor};
use serde::{Deserialize, Serialize};
use serde_json;
Expand Down
4 changes: 2 additions & 2 deletions bottlecap/src/config/env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use serde::Deserialize;
use std::collections::HashMap;
use std::time::Duration;

use datadog_trace_obfuscation::replacer::ReplaceRule;
use dogstatsd::util::parse_metric_namespace;
use libdd_trace_obfuscation::replacer::ReplaceRule;

use crate::{
config::{
Expand Down Expand Up @@ -892,7 +892,7 @@ mod tests {
)]),
apm_dd_url: "https://apm.datadoghq.com".to_string(),
apm_replace_tags: Some(
datadog_trace_obfuscation::replacer::parse_rules_from_string(
libdd_trace_obfuscation::replacer::parse_rules_from_string(
r#"[{"name":"test-tag","pattern":"test-pattern","repl":"replacement"}]"#,
)
.expect("Failed to parse replace rules"),
Expand Down
4 changes: 2 additions & 2 deletions bottlecap/src/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub mod service_mapping;
pub mod trace_propagation_style;
pub mod yaml;

use datadog_trace_obfuscation::replacer::ReplaceRule;
use libdd_trace_obfuscation::replacer::ReplaceRule;
use libdd_trace_utils::config_utils::{trace_intake_url, trace_intake_url_prefixed};

use serde::{Deserialize, Deserializer};
Expand Down Expand Up @@ -770,7 +770,7 @@ pub fn deserialize_optional_duration_from_seconds_ignore_zero<'de, D: Deserializ
#[cfg_attr(coverage_nightly, coverage(off))] // Test modules skew coverage metrics
#[cfg(test)]
pub mod tests {
use datadog_trace_obfuscation::replacer::parse_rules_from_string;
use libdd_trace_obfuscation::replacer::parse_rules_from_string;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion bottlecap/src/config/yaml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ use crate::{
},
merge_hashmap, merge_option, merge_option_to_value, merge_string, merge_vec,
};
use datadog_trace_obfuscation::replacer::ReplaceRule;
use figment::{
Figment,
providers::{Format, Yaml},
};
use libdd_trace_obfuscation::replacer::ReplaceRule;
use serde::Deserialize;

/// `YamlConfig` is a struct that represents some of the fields in the `datadog.yaml` file.
Expand Down
2 changes: 1 addition & 1 deletion bottlecap/src/lifecycle/invocation/processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,7 @@ mod tests {
$(
#[tokio::test]
async fn $name() {
use datadog_trace_obfuscation::obfuscation_config::ObfuscationConfig;
use libdd_trace_obfuscation::obfuscation_config::ObfuscationConfig;

let (
request_id,
Expand Down
12 changes: 6 additions & 6 deletions bottlecap/src/traces/trace_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ use crate::traces::{
LAMBDA_RUNTIME_URL_PREFIX, LAMBDA_STATSD_URL_PREFIX,
};
use async_trait::async_trait;
use datadog_trace_obfuscation::obfuscate::obfuscate_span;
use datadog_trace_obfuscation::obfuscation_config;
use libdd_common::Endpoint;
use libdd_trace_obfuscation::obfuscate::obfuscate_span;
use libdd_trace_obfuscation::obfuscation_config;
use libdd_trace_protobuf::pb;
use libdd_trace_protobuf::pb::Span;
use libdd_trace_utils::send_data::{Compression, SendDataBuilder};
Expand Down Expand Up @@ -479,7 +479,7 @@ mod tests {
time::{SystemTime, UNIX_EPOCH},
};

use datadog_trace_obfuscation::obfuscation_config::ObfuscationConfig;
use libdd_trace_obfuscation::obfuscation_config::ObfuscationConfig;

use crate::{LAMBDA_RUNTIME_SLUG, config::Config, tags::provider::Provider};

Expand Down Expand Up @@ -785,7 +785,7 @@ mod tests {
#[test]
fn test_root_span_filtering_drops_entire_trace() {
use crate::tags::provider::Provider;
use datadog_trace_obfuscation::obfuscation_config::ObfuscationConfig;
use libdd_trace_obfuscation::obfuscation_config::ObfuscationConfig;
use std::sync::Arc;

let root_span = pb::Span {
Expand Down Expand Up @@ -869,7 +869,7 @@ mod tests {
#[test]
fn test_root_span_filtering_allows_trace_when_no_match() {
use crate::tags::provider::Provider;
use datadog_trace_obfuscation::obfuscation_config::ObfuscationConfig;
use libdd_trace_obfuscation::obfuscation_config::ObfuscationConfig;
use std::sync::Arc;

let root_span = pb::Span {
Expand Down Expand Up @@ -953,7 +953,7 @@ mod tests {
#[test]
fn test_root_span_filtering_allows_trace_when_no_filter_tags() {
use crate::tags::provider::Provider;
use datadog_trace_obfuscation::obfuscation_config::ObfuscationConfig;
use libdd_trace_obfuscation::obfuscation_config::ObfuscationConfig;
use std::sync::Arc;

let root_span = pb::Span {
Expand Down
Loading