Skip to content

Commit 8326377

Browse files
authored
fix(agent-data-plane): align stray APP identity values with the Makefile (#2343)
## Human summary Align all of the places we build `agent-data-plane` to use the same `APP_FULL_NAME`, `APP_SHORT_NAME`, `APP_IDENTIFIER`. ## AI Summary `agent-data-plane`'s application identity (`APP_FULL_NAME`, `APP_SHORT_NAME`, `APP_IDENTIFIER`) is meant to be set consistently everywhere it's built, with the `Makefile`'s `ADP_APP_*` values treated as canonical (and documented as such in `docs/agent-data-plane/releasing.md`). `ci/tooling/windows-build-adp.ps1` had drifted to `APP_IDENTIFIER="agent-data-plane"` instead of `"adp"` (its own comment says it must match the Makefile), and both antithesis test Dockerfiles had `APP_SHORT_NAME="agent-data-plane"` instead of `"data-plane"`. This fixes both so the Windows and antithesis builds report the same identity as the Linux/macOS builds and CI packaging. ## Test plan - [x] Confirmed no other spots in the repo still set these to values inconsistent with the Makefile Co-authored-by: jesse.szwedko <jesse.szwedko@datadoghq.com>
1 parent 0f47357 commit 8326377

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

ci/tooling/windows-build-adp.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Install-CachedZipTool `
5050
# the same way as the linux/darwin binaries do.
5151
$env:APP_FULL_NAME = "Agent Data Plane"
5252
$env:APP_SHORT_NAME = "data-plane"
53-
$env:APP_IDENTIFIER = "agent-data-plane"
53+
$env:APP_IDENTIFIER = "adp"
5454
$env:APP_VERSION = $env:ADP_VERSION
5555
# Windows PowerShell 5.1 (the default `powershell.exe` in the LTSC2022 build image) doesn't
5656
# have Get-Date's -AsUTC switch (added in PS 7.1). ToUniversalTime() works on both.

test/antithesis/scenarios/differential/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN --mount=type=bind,source=rust-toolchain.toml,target=/tmp/rust-toolchain.toml
3030
# ---------------------------------------------------------------------------
3131
FROM build-base AS adp-builder
3232
ENV APP_FULL_NAME="Agent Data Plane" \
33-
APP_SHORT_NAME="agent-data-plane" \
33+
APP_SHORT_NAME="data-plane" \
3434
APP_IDENTIFIER="adp" \
3535
CARGO_PROFILE_RELEASE_LTO=off
3636
WORKDIR /adp

test/antithesis/scenarios/general/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN --mount=type=bind,source=rust-toolchain.toml,target=/tmp/rust-toolchain.toml
4646
# ---------------------------------------------------------------------------
4747
FROM build-base AS adp-builder
4848
ENV APP_FULL_NAME="Agent Data Plane" \
49-
APP_SHORT_NAME="agent-data-plane" \
49+
APP_SHORT_NAME="data-plane" \
5050
APP_IDENTIFIER="adp" \
5151
CARGO_PROFILE_RELEASE_LTO=off
5252
WORKDIR /adp

0 commit comments

Comments
 (0)