Skip to content

chore: refactor serverless e2e tests#2371

Merged
ava-silver merged 4 commits into
masterfrom
ava.silver/chore/refactor-serverless-e2e-tests
Jun 22, 2026
Merged

chore: refactor serverless e2e tests#2371
ava-silver merged 4 commits into
masterfrom
ava.silver/chore/refactor-serverless-e2e-tests

Conversation

@ava-silver

@ava-silver ava-silver commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

What and why?

Groups the serverless-owned e2e tests and their helpers under e2e/serverless/, with one subdirectory per feature (lambda, cloud-run, container-app, aas). These cloud-instrumentation tests and their verifiers were sitting flat among the other e2e files, and their ownership was spelled out across ~9 CODEOWNERS lines and duplicated path lists in CI.

Collecting them by package gives a single ownership boundary -- mirroring how packages/base/src/helpers/serverless already gets one CODEOWNERS entry -- and lets each CI change-detection filter point at a package glob instead of enumerating individual files. Adding a test, verifier, or shared helper no longer requires editing ci.yml. Non-serverless tests (junit, sarif, sbom, sourcemaps, synthetics, git-metadata, version) stay flat at the top level.

How?

  • Moved each feature's *.test.ts and its verifier into e2e/serverless/<feature>/:
    • lambda/ -- lambda.test.ts, lambda-verifier.ts
    • cloud-run/ -- cloud-run.test.ts, cloud-run-verifier.ts
    • container-app/ -- container-app.test.ts, container-app-verifier.ts
    • aas/ -- aas-linux.test.ts, aas-windows.test.ts, aas-verifier.ts
  • Kept the cross-cutting helpers (`telemetry-checker.ts`, `traffic.ts`) in `e2e/serverless/helpers/`. `exec.ts` and `junit-upload-checker.ts` stay in `e2e/helpers/` since they're shared / non-serverless.
  • Rewrote the relative imports affected by the moves: tests reach the shared `exec` at `../../helpers/exec`, their sibling verifier at `./-verifier`, and shared helpers at `../helpers/...`; verifiers reach `exec` at `../../helpers/exec`.
  • Removed `e2e/helpers/cloud-run-telemetry-checker.ts`, a thin wrapper that adapted a `string` arg to `checkTelemetryFlowing({serviceName})`. `cloud-run.test.ts` now imports `telemetry-checker` directly and uses the same call signature as the other tests.
  • Collapsed the serverless e2e CODEOWNERS block into a single `e2e/serverless/` entry and dropped two stale `e2e/fixtures/*` lines (those dirs don't exist).
  • Repointed each CI change-detection filter at `e2e/serverless//` plus `e2e/serverless/helpers/`.

No Jest or tsconfig changes needed: e2e discovery is recursive (`roots: ['e2e']`) and `e2e/tsconfig.json` already covers the new subdirs.

Review checklist

  • Feature or bugfix MUST have appropriate tests (unit, integration)

ava-silver commented Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

@datadog-datadog-prod-us1

This comment has been minimized.

@ava-silver ava-silver closed this Jun 17, 2026
@ava-silver ava-silver added serverless Related to [aas, cloud-run, lambda, stepfunctions] chores Related to the CI or developer experience labels Jun 17, 2026 — with Graphite App
@ava-silver ava-silver reopened this Jun 17, 2026
@ava-silver
ava-silver marked this pull request as ready for review June 17, 2026 21:19
@ava-silver
ava-silver requested review from a team as code owners June 17, 2026 21:19
@ava-silver
ava-silver requested a review from nina9753 June 17, 2026 21:19
@ava-silver
ava-silver force-pushed the ava.silver/chore/refactor-serverless-e2e-tests branch 5 times, most recently from cab8641 to ee260a1 Compare June 18, 2026 22:33
@ava-silver
ava-silver force-pushed the ava.silver/chore/add-web-app-e2e-checks branch 2 times, most recently from dbee69c to c8512a8 Compare June 22, 2026 14:37
@ava-silver
ava-silver force-pushed the ava.silver/chore/refactor-serverless-e2e-tests branch from ee260a1 to 0e64240 Compare June 22, 2026 14:37
@ava-silver
ava-silver force-pushed the ava.silver/chore/add-web-app-e2e-checks branch from c8512a8 to 94cef46 Compare June 22, 2026 14:50
@ava-silver
ava-silver force-pushed the ava.silver/chore/refactor-serverless-e2e-tests branch 2 times, most recently from 74043f9 to 5c99ae7 Compare June 22, 2026 15:26
@ava-silver
ava-silver force-pushed the ava.silver/chore/add-web-app-e2e-checks branch from 94cef46 to 6905508 Compare June 22, 2026 15:26
@ava-silver
ava-silver force-pushed the ava.silver/chore/refactor-serverless-e2e-tests branch from 5c99ae7 to c6a4a4c Compare June 22, 2026 18:42
@ava-silver
ava-silver force-pushed the ava.silver/chore/add-web-app-e2e-checks branch from 6905508 to 64bd964 Compare June 22, 2026 18:42
Base automatically changed from ava.silver/chore/add-web-app-e2e-checks to master June 22, 2026 19:22
@ava-silver
ava-silver force-pushed the ava.silver/chore/refactor-serverless-e2e-tests branch from c6a4a4c to 04c1d4a Compare June 22, 2026 19:22
@ava-silver
ava-silver force-pushed the ava.silver/chore/refactor-serverless-e2e-tests branch from cc0e3ab to f55b20b Compare June 22, 2026 21:00
@ava-silver
ava-silver merged commit df67891 into master Jun 22, 2026
150 of 159 checks passed
@ava-silver
ava-silver deleted the ava.silver/chore/refactor-serverless-e2e-tests branch June 22, 2026 21:17
@ava-silver ava-silver mentioned this pull request Jun 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

chores Related to the CI or developer experience serverless Related to [aas, cloud-run, lambda, stepfunctions]

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants