Skip to content

perf(wasm): rebuild std with immediate-abort panics #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bengl merged 1 commit into from
Sep 3, 2026
Merged

perf(wasm): rebuild std with immediate-abort panics #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/actions/setup-wasm/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ description: Restore the Cargo cache and install the pinned WASM toolchain
runs:
using: composite
steps:
- name: Add WASM target
run: rustup target add wasm32-unknown-unknown
- name: Install WASM Rust toolchain
run: |
rustup toolchain install "$(cat wasm-rust-toolchain)" \
--profile minimal \
--component rust-src \
--target wasm32-unknown-unknown
shell: bash
- name: Restore Cargo build cache
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
Expand All @@ -16,11 +20,12 @@ runs:
~/.cargo/registry/index
target
key: >-
wasm-${{ runner.os }}-${{ hashFiles('Cargo.lock', 'rust-toolchain.toml', '.cargo/config.toml') }}-${{
wasm-${{ runner.os }}-${{
hashFiles('Cargo.lock', '*rust-toolchain*', '.cargo/config.toml', 'scripts/build-wasm.js') }}-${{
hashFiles('Cargo.toml', 'crates/**/Cargo.toml', 'crates/**/*.rs') }}
restore-keys: >-
wasm-${{ runner.os }}-${{
hashFiles('Cargo.lock', 'rust-toolchain.toml', '.cargo/config.toml') }}-
hashFiles('Cargo.lock', '*rust-toolchain*', '.cargo/config.toml', 'scripts/build-wasm.js') }}-
- name: Install wasm-pack
env:
WASM_PACK_SHA256: 278a8d668085821f4d1a637bd864f1713f872b0ae3a118c77562a308c0abfe8d
Expand Down
24 changes: 21 additions & 3 deletions scripts/build-wasm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ const path = require('node:path')
const childProcess = require('node:child_process')

const isMacOS = os.platform() === 'darwin'
const wasmRustToolchain = fs.readFileSync(
path.join(__dirname, '..', 'wasm-rust-toolchain'),
'utf8',
).trim()
const libraries = [
'library_config',
'pipeline',
Expand All @@ -25,6 +29,20 @@ const libraries = [
const env = {
...process.env,
}
const pathKey = Object.keys(env).find(key => key.toUpperCase() === 'PATH') ?? 'PATH'
const rustFlagsKey = Object.keys(env).find(key => key.toUpperCase() === 'RUSTFLAGS') ?? 'RUSTFLAGS'
const rustupToolchainKey = Object.keys(env).find(key => key.toUpperCase() === 'RUSTUP_TOOLCHAIN') ?? 'RUSTUP_TOOLCHAIN'
const cargoPath = childProcess.execFileSync(
'rustup',
['which', 'cargo', '--toolchain', wasmRustToolchain],
{ encoding: 'utf8' },
).trim()
Comment on lines +35 to +39

@chatgpt-codex-connector chatgpt-codex-connector Bot Sep 3, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Install the pinned nightly for standalone builds

On developer machines or automation that invokes yarn build-wasm or npm run build:wasm --prefix packages/libdatadog directly, the new nightly is not installed because only .github/actions/setup-wasm performs that step. rustup which --help describes this command as “Display which binary will be run for a given command”; when the pinned toolchain is absent, this call exits nonzero before wasm-pack runs. Thus environments that previously had the stable WASM target configured now require an undocumented manual installation. Install the nightly and its rust-src/WASM components through the standalone build path, or provide an equivalent setup command used by these package scripts.

Useful? React with 👍 / 👎.


env[pathKey] = `${path.dirname(cargoPath)}${path.delimiter}${env[pathKey]}`
env[rustFlagsKey] = [env[rustFlagsKey], '-Zunstable-options', '-Cpanic=immediate-abort']
.filter(Boolean)
.join(' ')
env[rustupToolchainKey] = wasmRustToolchain

if (isMacOS) {
const homebrewDir = env.HOMEBREW_DIR ?? '/opt/homebrew'
Expand All @@ -42,9 +60,9 @@ if (isMacOS) {
process.exit(1) // eslint-disable-line unicorn/no-process-exit
}

if (!env.PATH.includes(llvmBinDir)) {
if (!env[pathKey].includes(llvmBinDir)) {
// Add LLVM to PATH if not already included
env.PATH = `${llvmBinDir}:${env.PATH}`
env[pathKey] = `${llvmBinDir}${path.delimiter}${env[pathKey]}`
}

// Force C/C++ code (e.g. zstd-sys) to use Homebrew's clang for wasm32. Otherwise a global
Expand All @@ -68,7 +86,7 @@ function buildWasm (cratePath, outputDirectory, options = {}) {
const args = ['build']
if (profiling) args.push('--profiling')
if (skipOptimization) args.push('--no-opt')
args.push('--target', 'nodejs', cratePath, '--out-dir', resolvedOutputDirectory)
args.push('--target', 'nodejs', cratePath, '--out-dir', resolvedOutputDirectory, '--', '-Z', 'build-std=std')
childProcess.execFileSync('wasm-pack', args, {
env: {
...env,
Expand Down
1 change: 1 addition & 0 deletions wasm-rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nightly-2026-07-26
Loading