Add Container App e2e telemetry contract#2364
Merged
ava-silver merged 3 commits intoJun 22, 2026
Merged
Conversation
Contributor
Author
ava-silver
changed the title
ava-silver
marked this pull request as ready for review
June 16, 2026 15:35
ava-silver
marked this pull request as draft
June 16, 2026 15:37
🎉 All green!🧪 All tests passed 🔗 Commit SHA: cbeac28 | Docs | Datadog PR Page | Give us feedback! |
ava-silver
changed the title
ava-silver
marked this pull request as ready for review
June 16, 2026 17:28
ava-silver
added
the
serverless
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
2 times, most recently
from
June 16, 2026 17:50
e8c9bc6 to
72626a5
Compare
ava-silver
force-pushed
the
graphite-base/2364
branch
from
June 16, 2026 18:15
36742bd to
96f0f8b
Compare
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 16, 2026 18:15
72626a5 to
4aa83a2
Compare
ava-silver
changed the base branch from
graphite-base/2364
to
tal.usvyatsky/datadog-ci-lambda-e2e-tests
June 16, 2026 18:15
This was referenced Jun 16, 2026
ava-silver
changed the base branch from
tal.usvyatsky/datadog-ci-lambda-e2e-tests
to
graphite-base/2364
June 16, 2026 18:22
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 16, 2026 18:23
4aa83a2 to
1a359ff
Compare
ava-silver
force-pushed
the
graphite-base/2364
branch
from
June 16, 2026 18:23
96f0f8b to
6b6d4c9
Compare
ava-silver
changed the base branch from
graphite-base/2364
to
tal.usvyatsky/datadog-ci-lambda-e2e-tests
June 16, 2026 18:23
nina9753
approved these changes
Jun 17, 2026
ava-silver
force-pushed
the
tal.usvyatsky/datadog-ci-lambda-e2e-tests
branch
from
June 17, 2026 17:54
6b6d4c9 to
bcf57a2
Compare
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 17, 2026 17:54
2bfcdae to
c30c9df
Compare
ava-silver
changed the base branch from
tal.usvyatsky/datadog-ci-lambda-e2e-tests
to
graphite-base/2364
June 17, 2026 18:23
ava-silver
force-pushed
the
graphite-base/2364
branch
from
June 17, 2026 18:23
bcf57a2 to
bf73bea
Compare
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 17, 2026 18:23
c30c9df to
6cd5dc1
Compare
ava-silver
changed the base branch from
graphite-base/2364
to
ava.silver/chore/sidecar-reinstrument-idempotency
June 17, 2026 18:23
1 task
ava-silver
added
the
chores
Graphite App
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 17, 2026 20:37
6cd5dc1 to
9fd84c5
Compare
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
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 17, 2026 20:45
9fd84c5 to
e700d40
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
ava.silver/chore/add-container-app-e2e-checks
branch
2 times, most recently
from
June 22, 2026 14:37
112e548 to
8cb96cd
Compare
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
from
June 22, 2026 14:37
1383e68 to
56385ad
Compare
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 22, 2026 14:50
8cb96cd to
b6cd212
Compare
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
2 times, most recently
from
June 22, 2026 15:26
624a228 to
43b9424
Compare
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 22, 2026 15:26
b6cd212 to
426ebf0
Compare
ava-silver
force-pushed
the
ava.silver/chore/sidecar-reinstrument-idempotency
branch
2 times, most recently
from
June 22, 2026 16:28
ed8a368 to
e3f84a2
Compare
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 22, 2026 16:28
426ebf0 to
a5a35eb
Compare
Contributor
Author
Merge activity
|
ava-silver
changed the base branch from
ava.silver/chore/sidecar-reinstrument-idempotency
to
graphite-base/2364
June 22, 2026 17:02
ava-silver
added a commit
that referenced
this pull request
Jun 22, 2026
…#2370) ### What and why? Re-running `instrument` on 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 existing `resources` and env vars, and deduping the shared volume mount via a new `ensureSharedVolumeMount` helper -- instead of replacing it wholesale. - `packages/plugin-container-app/src/common.ts`: set `DD_APM_ENABLED=true` so the sidecar enables APM. - Updates the affected unit tests and the instrument snapshot. ### Test plan - `yarn test` for `packages/base` serverless helpers and `packages/plugin-container-app` (60 tests pass). - End-to-end idempotency is asserted by the Container App e2e suite in #2364. ### Review checklist - [x] Feature or bugfix MUST have appropriate tests (unit, integration)
ava-silver
force-pushed
the
ava.silver/chore/add-container-app-e2e-checks
branch
from
June 22, 2026 17:03
a5a35eb to
cbeac28
Compare
Merged
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
3 participants
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?
Brings the Azure Container App e2e suite up to the serverless instrumentation contract: provision a real workload image, verify Datadog instrumentation state, confirm logs and spans for a run-specific identity, assert idempotent re-instrumentation, and verify uninstrument cleanup.
Stacked on #2370 (sidecar idempotency fix) and #2369 (shared telemetry checker).
How?
AZURE_CONTAINER_APP_IMAGE_E2Efrom GitHub variables and create the test app on the workload's port.service/env/version/one_e2e_run_idargs and no source-code integration.DD_*env vars, identity tags, and full cleanup on uninstrument.Manual verification
Review checklist