Support .NET local build testing on ARM Mac#6495
Merged
Conversation
- PHP: Strip startup warnings from version string to fix semantic_version parsing - PHP: Conditionally enable profiling based on bundle contents - C++: Use TARGETARCH ARG for multi-arch base image selection - .NET: Conditionally set LD_PRELOAD via entrypoint to avoid x64-only .so crash on ARM Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
|
|
Dockerfile heredoc syntax requires BuildKit which may not be available in all CI environments. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
bm1549
added a commit
that referenced
this pull request
Mar 13, 2026
Use Docker's TARGETARCH build arg instead of hardcoding amd64 in the C++ parametric base image tag, so the image builds correctly on ARM (Apple Silicon) as well. Split out from #6495. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
5 tasks
The multi-arch TARGETARCH change for the C++ parametric Dockerfile has been moved to a separate PR (#6498) to keep this PR focused on .NET, PHP, and Python ARM Mac support. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
bm1549
changed the title
|
✅ Tests 🎉 All green!❄️ No new flaky tests detected 🔗 Commit SHA: e112e51 | Docs | Datadog PR Page | Was this helpful? React with 👍/👎 or give us feedback! |
4 tasks
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
bm1549
changed the title
cbeauchesne
requested changes
Mar 19, 2026
bm1549
added
the
ai-generated
Move inline echo-based entrypoint.sh generation to a standalone file and COPY it in the Dockerfile, per reviewer feedback. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
cbeauchesne
approved these changes
Mar 23, 2026
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
2 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.
Motivation
Running parametric tests with locally built tracer libraries on ARM Mac (Apple Silicon) fails for .NET because the Dockerfile unconditionally sets
LD_PRELOADto the x86_64-onlyApiWrapper.x64.so, which crashes the container immediately on ARM.Changes
utils/build/docker/dotnet/parametric/Dockerfile): Replace the staticENV LD_PRELOAD=...x64.sowith an entrypoint wrapper that checks for the file's existence at runtime. TheApiWrapper.x64.sois x86_64-only and crashes the container immediately on ARM.Note: PHP changes have been split out to #6512. C++ changes were split out to #6498.
Workflow
🚀 Once your PR is reviewed and the CI green, you can merge it!
🛟 #apm-shared-testing 🛟
Reviewer checklist
tests/ormanifests/is modified ? I have the approval from R&P teambuild-XXX-imagelabel is present🤖 Generated with Claude Code