make sidecar re-instrument idempotent and enable APM on container-app#2370
Merged
ava-silver merged 1 commit intoJun 22, 2026
Merged
Conversation
This was referenced Jun 17, 2026
Contributor
Author
ava-silver
marked this pull request as ready for review
June 17, 2026 18:24
avangelillo
approved these changes
Jun 17, 2026
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
from
June 17, 2026 20:37
bf73bea to
cbb9f14
Compare
ava-silver
force-pushed
the
tal.usvyatsky/datadog-ci-lambda-e2e-tests
branch
2 times, most recently
from
June 17, 2026 20:45
61bbd3b to
b097b38
Compare
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
from
June 17, 2026 20:45
cbb9f14 to
f151d5f
Compare
1 task
duncanista
approved these changes
Jun 18, 2026
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
from
June 18, 2026 22:33
f151d5f to
1383e68
Compare
ava-silver
force-pushed
the
tal.usvyatsky/datadog-ci-lambda-e2e-tests
branch
from
June 18, 2026 22:33
b097b38 to
957856e
Compare
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
from
June 22, 2026 14:37
1383e68 to
56385ad
Compare
🎉 All green!🧪 All tests passed 🔗 Commit SHA: e3f84a2 | Docs | Datadog PR Page | Give us feedback! |
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
from
June 22, 2026 14:50
56385ad to
624a228
Compare
ava-silver
force-pushed
the
tal.usvyatsky/datadog-ci-lambda-e2e-tests
branch
from
June 22, 2026 15:26
34e1df8 to
9ed1b16
Compare
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
from
June 22, 2026 15:26
624a228 to
43b9424
Compare
ava-silver
changed the base branch from
tal.usvyatsky/datadog-ci-lambda-e2e-tests
to
graphite-base/2370
June 22, 2026 16:27
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
from
June 22, 2026 16:27
43b9424 to
ed8a368
Compare
ava-silver
force-pushed
the
graphite-base/2370
branch
from
June 22, 2026 16:27
9ed1b16 to
ba7805a
Compare
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
from
June 22, 2026 16:28
ed8a368 to
e3f84a2
Compare
Contributor
Author
Merge activity
|
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.

What and why?
Re-running
instrumenton a serverless-init sidecar target (Azure Container App) must be a true no-op. Previously a re-instrument could drop provider-populated sidecar fields (e.g.resources) and re-append the shared volume mount, producing config drift. This makes the sidecar merge idempotent and enables APM on the Container App sidecar.Split out from the Container App e2e PR (#2364) so the production behavior change is reviewed on its own. Stacked on #2333.
How?
packages/base/src/helpers/serverless/common.ts: when a sidecar container already exists, merge the new config onto it -- preserving existingresourcesand env vars, and deduping the shared volume mount via a newensureSharedVolumeMounthelper -- instead of replacing it wholesale.packages/plugin-container-app/src/common.ts: setDD_APM_ENABLED=trueso the sidecar enables APM.Test plan
yarn testforpackages/baseserverless helpers andpackages/plugin-container-app(60 tests pass).Review checklist