[APMSVLS-499] test infra: use shared `datadog-mock-intake` crate and add standalone `mock-intake` binary by lucaspimentel · Pull Request #1392 · DataDog/datadog-lambda-extension

lucaspimentel · 2026-09-25T17:05:26Z

Overview

Consumes the datadog-mock-intake crate from DataDog/serverless-components (#174)

The APM and DSM integration tests now use the shared crate as an ungated dev-dependency; the 317-line test-local intake fixture (tests/common/fake_intake.rs) is deleted.
Adds a standalone mock-intake binary behind a new mock-intake feature for local APM debugging: it runs the shared crate with request summaries, stats failure injection (MOCK_INTAKE_FAIL_STATS_FIRST_N), and JSON dumps (MOCK_INTAKE_DUMP_DIR). See bottlecap/src/bin/mock-intake/README.md for the workflow. The smoke procedure uses the bottlecap-test-mode binary from [APMSVLS-501] feat(bottlecap): add bottlecap-test-mode binary #1216.
CI clippy now compiles the mock-intake feature so the binary stays checked, and GitLab clippy now lints all targets (matching GitHub CI). Test runs are unchanged: the integration tests run in every feature set, as before.

Supersedes #1385, which introduced the intake as a bottlecap library module; that implementation now lives in the shared crate.

Testing

cargo test -p bottlecap (default): suite passes, including apm_integration_test and dsm_integration_test.
cargo build -p bottlecap --features mock-intake: clean. cargo clippy --workspace --all-targets across default / fips / mock-intake feature sets: no lint warnings.
dd-rust-license-tool check: passes (no new third-party dependencies; the crate is first-party).
Manual smoke: ran the mock-intake binary with failure injection and a dump directory, POSTed a gzip msgpack StatsPayload to /api/v0.2/stats: 202 Accepted, mock-intake: summary line with grouped hits and normalized aggregation key, and a JSON dump containing the decoded payload; SIGINT shutdown clean.

APMSVLS-499

datadog-prod-us1-3 · 2026-09-25T17:07:00Z

❌ Errors

Your PR has failed checks. Please review the issues below and take necessary action before merging.

🚦 2 Pipeline jobs failed

DDCI - DataDog/datadog-lambda-extension | publish layer e2e sandbox (amd64)

View more details · View in DDCI

DataDog/datadog-lambda-extension | publish layer e2e sandbox (amd64)

View more details · View in GitLab

Useful? React with 👍 / 👎

_{This comment will be updated automatically if new data arrives.

🔗 Commit SHA: 99c5fb9 | Docs | View more details | Give us feedback!}

lucaspimentel · 2026-09-25T22:24:24Z

Note to self: rename fake-intake to mock-intake

lucaspimentel · 2026-09-25T22:54:56Z

@DataDog review

datadog-prod-us1-3

More details

The shared intake preserves the migrated integration-test contract, and the standalone binary remains gated from production builds.

Was this helpful? React 👍 or 👎

_{Open Bits AI session}

_{🤖 Bits Code Review · Commit 6826b1f · @DataDog review to ask questions}

chatgpt-codex-connector · 2026-10-21T22:22:46Z

Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-11-07T05:39:43.540204Z	`99c5fb9`	New commits
🔒 Security Review	✅ Completed 2026-11-07T05:39:53.620443Z	`99c5fb9`	New commits

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

lucaspimentel · 2026-10-21T22:22:58Z

@DataDog review

datadog-prod-us1-3

More details

The completed static review found that the shared intake preserves existing integration-test assertions and the standalone binary remains gated behind the opt-in mock-intake feature. No actionable regressions were identified.

Was this helpful? React 👍 or 👎

_{Open Bits AI session}

_{🤖 Bits Code Review · Commit 86483e6}

Copilot

🟡 Changes recommended

The standalone intake retains traffic without bounds and silently treats SIGINT-handler errors as successful shutdowns.

2 open issues

What changed in this PR

Replaces Bottlecap’s test-local intake fixture with the shared datadog-mock-intake crate and adds a feature-gated binary for local APM debugging.

Changes:

Migrates APM and DSM integration tests to the shared crate without feature-gating the tests.
Adds a standalone intake with request summaries, stats failure injection, JSON dumps, and usage documentation.
Updates dependency metadata and CI lint coverage for the new binary.

File	Description
`bottlecap/tests/dsm_integration_test.rs`	Uses the shared intake for DSM payload tests.
`bottlecap/tests/common/mod.rs`	Removes the obsolete common-module file.
`bottlecap/tests/common/fake_intake.rs`	Deletes the test-local intake implementation.
`bottlecap/tests/apm_integration_test.rs`	Migrates APM tests and helpers to `MockIntake`.
`bottlecap/src/bin/mock-intake/README.md`	Documents configuration, endpoints, and the smoke workflow.
`bottlecap/src/bin/mock-intake/main.rs`	Adds the standalone intake launcher and signal handling.
`bottlecap/README.md`	Introduces local debugging and links detailed instructions.
`bottlecap/LICENSE-3rdparty.csv`	Records the shared crate’s license.
`bottlecap/Cargo.toml`	Declares the dependency, feature, and binary target.
`bottlecap/Cargo.lock`	Locks the shared crate and updates dependency references.
`.gitlab/templates/pipeline.yaml.tpl`	Lints all targets and includes the new feature.
`.github/workflows/rs_ci.yml`	Includes the new feature in Clippy coverage.

_{Review effort: Balanced}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 68e033eee6

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 17c8f262c3

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…inary Replace the test-local APM intake fixture with the datadog-mock-intake crate from serverless-components (pinned to its first published revision). The APM and DSM integration tests use it as an ungated dev-dependency and run in every test build; the previous fixture is deleted. Add a standalone fake-intake binary behind a new fake-intake feature for local APM debugging: it runs the shared crate with request summaries, stats failure injection (FAKE_INTAKE_FAIL_STATS_FIRST_N), and JSON dumps (FAKE_INTAKE_DUMP_DIR). CI clippy now compiles the feature so the binary stays checked.

The standalone binary is now mock-intake, gated by the mock-intake feature, configured with MOCK_INTAKE_PORT, MOCK_INTAKE_FAIL_STATS_FIRST_N, and MOCK_INTAKE_DUMP_DIR. This aligns the binary with the datadog-mock-intake crate it wraps, whose summaries already used the mock-intake prefix. The mock-intake crate is now a git dependency, so LICENSE-3rdparty.csv gains its first-party record.

Dedupe the duplicated env-var parsing in the mock-intake binary into a generic parse_env_or helper with identical error messages, and drop the rmp-serde/flate2 dev-dependencies left over from when the harness decoded stats payloads itself; the shared datadog-mock-intake crate handles that now.

This was referenced Sep 25, 2026

APMSVLS-494: add a standalone fake intake for local APM debugging #1385

Closed

[APM] Add shared mock intake and migrate trace-agent tests DataDog/serverless-components#174

Merged

lucaspimentel changed the title ~~Use shared datadog-mock-intake crate and add standalone fake-intake binary~~ Use shared datadog-mock-intake crate and add standalone fake-intake binary Sep 25, 2026

datadog-prod-us1-3 Bot reviewed Sep 25, 2026

View reviewed changes

lucaspimentel changed the title ~~Use shared datadog-mock-intake crate and add standalone fake-intake binary~~ Use shared datadog-mock-intake crate and add standalone mock-intake binary Sep 29, 2026

lucaspimentel force-pushed the lpimentel/mock-intake-consume branch 2 times, most recently from b1d9813 to 86483e6 Compare October 21, 2026 21:35

lucaspimentel marked this pull request as ready for review October 21, 2026 22:22

lucaspimentel requested review from a team as code owners October 21, 2026 22:22

lucaspimentel requested review from lym953 and a balanced review from Copilot October 21, 2026 22:22

lucaspimentel changed the title ~~Use shared datadog-mock-intake crate and add standalone mock-intake binary~~ test infra: use shared datadog-mock-intake crate and add standalone mock-intake binary Oct 21, 2026

Copilot started reviewing on behalf of lucaspimentel October 21, 2026 22:23

View session

datadog-prod-us1-3 Bot reviewed Oct 21, 2026

View reviewed changes

Copilot AI reviewed Oct 21, 2026

View reviewed changes

Comment thread bottlecap/src/bin/mock-intake/main.rs Resolved

Comment thread bottlecap/src/bin/mock-intake/main.rs Resolved

lucaspimentel force-pushed the lpimentel/mock-intake-consume branch 3 times, most recently from 3435d00 to 68e033e Compare October 26, 2026 14:01

chatgpt-codex-connector Bot reviewed Oct 26, 2026

View reviewed changes

Comment thread bottlecap/src/bin/mock-intake/README.md Resolved

lucaspimentel changed the title ~~test infra: use shared datadog-mock-intake crate and add standalone mock-intake binary~~ [APMSVLS-499] test infra: use shared datadog-mock-intake crate and add standalone mock-intake binary Oct 30, 2026

lucaspimentel force-pushed the lpimentel/mock-intake-consume branch 3 times, most recently from a511e00 to 76d25cf Compare November 4, 2026 21:24

chatgpt-codex-connector Bot reviewed Nov 4, 2026

View reviewed changes

Comment thread bottlecap/src/bin/mock-intake/README.md Resolved

lucaspimentel force-pushed the lpimentel/mock-intake-consume branch 2 times, most recently from cc6e68d to a1b16a3 Compare November 7, 2026 02:26

lucaspimentel added 17 commits November 7, 2026 00:05

Point mock-intake smoke docs at test-mode PR

7a66922

Use pipeline_stats_url() in mock-intake startup output

657cd30

Accept non-UTF-8 paths for MOCK_INTAKE_DUMP_DIR

ed521cf

Lint all targets in every GitLab clippy run

5bf9e7d

Rename fake intake references in tests to mock intake

553d1a1

Remove orphaned empty tests/common module

20b9742

Move mock-intake detail docs to binary README

b0a3eb7

Pin datadog-mock-intake to the merged serverless-components rev

ca798c4

Simplify mock intake configuration and fixtures

10d15ef

Disable captures in standalone mock intake

190509d

Propagate mock intake signal errors

51cff75

Build smoke test binaries from one checkout

0f1c679

Enable JSON dumps in the smoke procedure

076ef97

Simplify mock intake setup and documentation

d763a38

lucaspimentel force-pushed the lpimentel/mock-intake-consume branch from a1b16a3 to d763a38 Compare November 7, 2026 05:12

lucaspimentel added 2 commits November 7, 2026 00:19

Deduplicate mock-intake env var docs

d5f6607

Run mock-intake binary tests in CI

99c5fb9

Navigation Menu

Repository navigation

[APMSVLS-499] test infra: use shared `datadog-mock-intake` crate and add standalone `mock-intake` binary - #1392

[APMSVLS-499] test infra: use shared `datadog-mock-intake` crate and add standalone `mock-intake` binary#1392
lucaspimentel wants to merge 19 commits into
mainfrom
lpimentel/mock-intake-consume

lucaspimentel commented Sep 25, 2026 •

edited

Loading

Uh oh!

datadog-prod-us1-3 Bot commented Sep 25, 2026 •

edited by datadog-datadog-prod-us1 Bot

Loading

Uh oh!

lucaspimentel commented Sep 25, 2026

Uh oh!

lucaspimentel commented Sep 25, 2026

Uh oh!

datadog-prod-us1-3 Bot left a comment

Uh oh!

chatgpt-codex-connector Bot commented Oct 21, 2026 •

edited

Loading

Uh oh!

lucaspimentel commented Oct 21, 2026

Uh oh!

datadog-prod-us1-3 Bot left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

lucaspimentel commented Sep 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Testing

Uh oh!

datadog-prod-us1-3 Bot commented Sep 25, 2026 • edited by datadog-datadog-prod-us1 Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ Errors

Uh oh!

lucaspimentel commented Sep 25, 2026

Uh oh!

lucaspimentel commented Sep 25, 2026

Uh oh!

datadog-prod-us1-3 Bot left a comment

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot commented Oct 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lucaspimentel commented Oct 21, 2026

Uh oh!

datadog-prod-us1-3 Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

lucaspimentel commented Sep 25, 2026 •

edited

Loading

datadog-prod-us1-3 Bot commented Sep 25, 2026 •

edited by datadog-datadog-prod-us1 Bot

Loading

chatgpt-codex-connector Bot commented Oct 21, 2026 •

edited

Loading