[SVLS-9800] fix(config): Support AWS Secrets Manager ARNs for dual-shipping additional endpoints - #1391
Merged
shreyamalpani merged 4 commits intoSep 25, 2026
Conversation
|
🔄 Datadog auto-retried 1 job - 0 passed on retry 🔗 Commit SHA: 968d01c | Docs | View more details | Give us feedback! |
shreyamalpani
force-pushed
the
shreya.malpani/add-secrets-manager-arn-support-dual-shipping
branch
2 times, most recently
from
September 25, 2026 14:45
5233018 to
d0370f4
Compare
shreyamalpani
marked this pull request as ready for review
September 25, 2026 15:17
shreyamalpani
requested review from
duncanista
and
a lite review from Copilot
September 25, 2026 15:17
Contributor
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
Add bounded timeouts for startup secret requests and broader feature-path test coverage.
Get a fresh assessment by requesting another Copilot review.
Review effort: Lite
Findings: 1
Open (2)
What changed in this PR
Adds AWS Secrets Manager ARN support for dual-shipping metrics, traces, and logs endpoint configuration.
Changes:
- Resolves endpoint secrets during startup with plaintext fallback on failure.
- Integrates resolution before telemetry flushers initialize.
- Updates
serverless-componentsdependency revisions.
| File | Description |
|---|---|
bottlecap/src/secrets/decrypt.rs |
Implements secret fetching, parsing, and endpoint resolution. |
bottlecap/src/bin/bottlecap/main.rs |
Integrates endpoint resolution at startup. |
bottlecap/Cargo.toml |
Updates dependency revision. |
bottlecap/Cargo.lock |
Locks updated dependencies. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+167
to
+175
| if let Some(metrics) = metrics { | ||
| config.additional_endpoints = metrics; | ||
| } | ||
| if let Some(apm) = apm { | ||
| config.apm_additional_endpoints = apm; | ||
| } | ||
| if let Some(logs) = logs { | ||
| config.logs_config_additional_endpoints = logs; | ||
| } |
shreyamalpani
marked this pull request as draft
September 25, 2026 15:23
litianningdatadog
requested review from
litianningdatadog
and removed request for
duncanista
September 25, 2026 15:27
litianningdatadog
requested changes
Sep 25, 2026
shreyamalpani
marked this pull request as ready for review
September 25, 2026 18:39
litianningdatadog
approved these changes
Sep 25, 2026
shreyamalpani
deleted the
shreya.malpani/add-secrets-manager-arn-support-dual-shipping
branch
September 25, 2026 19:49
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.


Summary
Adds support for sourcing dual-shipping to additional endpoints (across metrics, traces, and logs) from an AWS Secrets Manager secret ARN, instead of requiring the endpoints/keys to be embedded as plaintext env vars. This mirrors the existing pattern for resolving the primary
DD_API_KEYfrom Secrets Manager.Three new env vars are read at startup and, if set, resolved and merged into the existing plaintext additional-endpoints config:
DD_ADDITIONAL_ENDPOINTS_SECRET_ARN→ merges intoDD_ADDITIONAL_ENDPOINTS(metrics)DD_APM_ADDITIONAL_ENDPOINTS_SECRET_ARN→ merges intoDD_APM_ADDITIONAL_ENDPOINTS(traces)DD_LOGS_CONFIG_ADDITIONAL_ENDPOINTS_SECRET_ARN→ merges intoDD_LOGS_CONFIG_ADDITIONAL_ENDPOINTS(logs)Secret content uses the same JSON shape as the corresponding plaintext env var as defined in docs.
Motivation
GitHub issue #1370
Design
DD_API_KEYresolution path (create_api_key_factory/resolve_secrets) — this is a separate, additive resolution step.serverless-componentsgit rev to8156757to pick up the correspondingdatadog-agent-configschema changes (new*_secret_arnfields) from config: add additional endpoints secret ARN environment variables serverless-components#171Testing