Skip to content

build: squash the perfetto backports into one Node.js patch - #53990

Merged
MarshallOfSound merged 2 commits into
mainfrom
chore/consolidate-node-patches
Sep 16, 2026
Merged

build: squash the perfetto backports into one Node.js patch#53990
MarshallOfSound merged 2 commits into
mainfrom
chore/consolidate-node-patches

Conversation

@codebytere

@codebytere codebytere commented Sep 16, 2026

Copy link
Copy Markdown
Member

Description of Change

The perfetto trace agent came into patches/node as six separate cherry-picks of nodejs/node#64565 and nodejs/node#64721. Both are marked dont-land-on-v24.x upstream, so they stay for as long as Electron ships Node.js 24; this carries them as one patch instead. It also folds the CleanupHookThunkRun regression test into the patch for its fix, matching how nodejs/node#65630 landed.

The patched Node.js tree is byte-identical before and after (verified by re-applying the series to v24.21.0 and diffing); patches/node goes from 58 files to 52.

Checklist

Release Notes

Notes: none

@codebytere
chore: squash the perfetto backports into one Node.js patch
aa8de2d 
The perfetto trace agent came in as six separate cherry-picks of
nodejs/node#64565 and nodejs/node#64721. Both are marked dont-land-on-v24.x
upstream, so they stay for as long as Electron ships Node.js 24; carry them
as one patch. Likewise fold the CleanupHookThunkRun regression test into
the patch for its fix, matching nodejs/node#65630.

No change to the patched tree.
@codebytere
codebytere requested a review from a team as a code owner September 16, 2026 10:56
@deepak1556

deepak1556 commented Sep 16, 2026

Copy link
Copy Markdown
Member

For context, the perfetto trace writer implemented in src/tracing/agent_perfetto.cc is not something we will ever use. In our case the trace controller and writer are maintained by chromium, contentTracing module or --enable-tracing are our entry points. With the perfetto migration the only thing we need from Node.js are trace categories registration and dynamic guards to modules. If there is possibility to reduce the patch by eliminating the unused parts that would be good too.

@codebytere

codebytere commented Sep 16, 2026

Copy link
Copy Markdown
Member Author

@deepak1556 this one is just the squash - the patched tree is byte-identical before and after. trimming the backport down to category registration plus the JS/module guards (dropping agent_perfetto, the trace writer and node_use_perfetto_sdk) sounds right to me; i'd rather land that as its own PR on top of this one so the diff here stays a no-op, unless you'd prefer it folded in?

@deepak1556

deepak1556 commented Sep 16, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

i'd rather land that as its own PR on top of this one so the diff here stays a no-op

Yup that sounds good to me, just wanted to give context about the unused pieces in the patch :)

@codebytere codebytere changed the title chore: squash the perfetto backports into one Node.js patch build: squash the perfetto backports into one Node.js patch Sep 16, 2026
@MarshallOfSound
MarshallOfSound merged commit 48130f1 into main Sep 16, 2026
77 checks passed
@release-clerk

release-clerk Bot commented Sep 16, 2026

Copy link
Copy Markdown

No Release Notes

@MarshallOfSound
MarshallOfSound deleted the chore/consolidate-node-patches branch September 16, 2026 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@deepak1556 deepak1556 deepak1556 approved these changes

Assignees

No one assigned

Labels

46-x-y no-backport semver/none

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@codebytere @deepak1556 @MarshallOfSound