fix(crypto): switch to ring for non-FIPS builds, bump libdatadog#1137
Open
duncanista wants to merge 3 commits intomainfrom
Open
fix(crypto): switch to ring for non-FIPS builds, bump libdatadog#1137duncanista wants to merge 3 commits intomainfrom
duncanista wants to merge 3 commits intomainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Switches the non-FIPS TLS crypto backend to ring (while keeping FIPS builds on the rustls FIPS provider) and updates libdatadog + related config wiring accordingly.
Changes:
- Switch rustls feature/provider usage from
aws-lc-rstoringfor non-FIPS builds (including provider initialization in the trace HTTP client and a unit test). - Bump
libdatadoggit revisions forlibdd-*crates and regenerateCargo.lock. - Adapt
ObfuscationConfigconstruction to the newer nested-struct API.
Reviewed changes
Copilot reviewed 3 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| bottlecap/src/traces/trace_processor.rs | Updates test-time rustls provider installation to ring. |
| bottlecap/src/traces/http_client.rs | Installs ring as the default rustls crypto provider for custom TLS/root-cert handling. |
| bottlecap/src/bin/bottlecap/main.rs | Updates ObfuscationConfig initialization to nested config structs + defaults. |
| bottlecap/Cargo.toml | Switches rustls features to ring and bumps libdd-* deps to the new libdatadog rev. |
| bottlecap/Cargo.lock | Lockfile updates reflecting libdatadog bump + new transitive deps. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
duncanista
force-pushed
the
jordan.gonzalez/crypto/use-ring-for-non-fips
branch
2 times, most recently
from
95775c0 to
6bc2de8
Compare
lym953
approved these changes
Apr 3, 2026
Switch the default crypto backend from aws-lc-rs to ring for non-FIPS builds, reducing the release binary size by ~15% (8.7MB -> 7.4MB on macOS arm64). FIPS builds continue to use aws-lc-rs via rustls/fips. - Bump libdatadog to 18a02650 (ring for non-FIPS) - Switch rustls features from aws-lc-rs to ring - Update crypto provider init to use ring::default_provider() - Adapt ObfuscationConfig to new nested struct API
Update all libdatadog dependencies to v31.0.0, adapting to API changes: - GenericHttpClient moved to libdd_common::http_common - SendData::send() and stats_utils::send_stats_payload now require HttpClientTrait, so wrap our proxy-enabled client in an impl - Add libdd-capabilities / libdd-capabilities-impl to LICENSE-3rdparty
duncanista
force-pushed
the
jordan.gonzalez/crypto/use-ring-for-non-fips
branch
from
6bc2de8 to
1b24ef7
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
Switch the default crypto backend from aws-lc-rs to ring for non-FIPS builds, reducing the release binary size by ~15% (8.7MB -> 7.4MB on macOS arm64). FIPS builds continue to use aws-lc-rs via rustls/fips.
Other
Testing
Layer size check
DataDog/libdatadog#1816