Skip to content

Commit a2758aa

Browse files
committed
chore(deps): gate libdatadog TLS features per #1872 guidance
Apply the consumer-side pattern from DataDog/libdatadog#1872: libdd-* deps with default-features = false, with explicit https/fips forwarding from bottlecap's own default/fips features. This is the configuration the PR description recommends for downstream consumers. It does not on its own fix the FIPS clippy job, because libdd-trace-stats still pulls libdd-capabilities-impl with default features inside its own Cargo.toml — that path needs an upstream follow-up to #1872 to fully gate.
1 parent eb09f11 commit a2758aa

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

bottlecap/Cargo.toml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ indexmap = {version = "2.11.0", default-features = false}
7575
datadog-protos = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "f863626dbfe3c59bb390985fa6530b0621c2a0a2"}
7676
ddsketch-agent = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "f863626dbfe3c59bb390985fa6530b0621c2a0a2"}
7777
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0" }
78-
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0" }
79-
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0" }
80-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0" , features = ["mini_agent"] }
81-
libdd-trace-normalization = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0" }
82-
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0" }
83-
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0" }
78+
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0", default-features = false }
79+
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0" }
80+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0", default-features = false, features = ["mini_agent"] }
81+
libdd-trace-normalization = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0" }
82+
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0", default-features = false }
83+
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "0a70516d66314efdd7115644b0da4b3b3e0958e0", default-features = false }
8484
datadog-opentelemetry = { git = "https://github.com/DataDog/dd-trace-rs", rev = "f51cefc4ad24bec81b38fb2f36b1ed93f21ae913", default-features = false }
8585
dogstatsd = { git = "https://github.com/DataDog/serverless-components", rev = "8817486d6ec7eb7101c4f349b3d2b75cae701740", default-features = false }
8686
datadog-fips = { git = "https://github.com/DataDog/serverless-components", rev = "8817486d6ec7eb7101c4f349b3d2b75cae701740", default-features = false }
@@ -124,10 +124,18 @@ opt-level = 3
124124
tikv-jemallocator = "0.5"
125125

126126
[features]
127-
default = ["reqwest/rustls-tls-native-roots", "datadog-fips/default" ]
127+
default = [
128+
"reqwest/rustls-tls-native-roots",
129+
"datadog-fips/default",
130+
"libdd-common/https",
131+
"libdd-trace-utils/https",
132+
"libdd-trace-obfuscation/https",
133+
"libdd-trace-stats/https",
134+
]
128135
fips = [
129136
"libdd-common/fips",
130137
"libdd-trace-utils/fips",
138+
"libdd-trace-obfuscation/fips",
131139
"datadog-fips/fips",
132140
"libddwaf/fips",
133141
"reqwest/rustls-tls-native-roots-no-provider",

0 commit comments

Comments
 (0)