test(nextjs): Add orchestrion e2e test app - #22080

Merged
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e
Jul 10, 2026
Merged

test(nextjs): Add orchestrion e2e test app#22080
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e

Conversation

@chargome

@chargomechargome commented Jul 8, 2026

Copy link
Copy Markdown
Member

Adds an e2e test for nextjs-16 with opt-in for orchestrion.

Tests both webpack+turbopack paths

closes#21993

@chargomechargome self-assigned this Jul 8, 2026
@github-actions

github-actionsBot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.6 kB--
@sentry/browser - with treeshaking flags26.04 kB--
@sentry/browser (incl. Tracing)46.35 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.14 kB--
@sentry/browser (incl. Tracing, Profiling)51.13 kB--
@sentry/browser (incl. Tracing, Replay)85.62 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.26 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.33 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)102.99 kB--
@sentry/browser (incl. Feedback)44.78 kB--
@sentry/browser (incl. sendFeedback)32.4 kB--
@sentry/browser (incl. FeedbackAsync)37.53 kB--
@sentry/browser (incl. Metrics)28.68 kB--
@sentry/browser (incl. Logs)28.93 kB--
@sentry/browser (incl. Metrics & Logs)29.61 kB--
@sentry/react29.39 kB--
@sentry/react (incl. Tracing)48.62 kB--
@sentry/vue33.03 kB--
@sentry/vue (incl. Tracing)48.33 kB--
@sentry/svelte27.63 kB--
CDN Bundle30 kB--
CDN Bundle (incl. Tracing)48.33 kB--
CDN Bundle (incl. Logs, Metrics)31.58 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.65 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.82 kB--
CDN Bundle (incl. Tracing, Replay)85.84 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.16 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.64 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)92.92 kB--
CDN Bundle - uncompressed89.33 kB--
CDN Bundle (incl. Tracing) - uncompressed146.07 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.03 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.05 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed218.76 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.28 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.24 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed278.98 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed282.93 kB--
@sentry/nextjs (client)51.17 kB--
@sentry/sveltekit (client)46.8 kB--
@sentry/core/server78.42 kB--
@sentry/core/browser64.77 kB--
@sentry/node-core62.73 kB+0.01%+2 B 🔺
@sentry/node125.35 kB+0.01%+1 B 🔺
@sentry/node (incl. diagnostics channel injection)139.63 kB--
@sentry/node/import (ESM hook with diagnostics-channel injection)69.95 kB--
@sentry/node/light50.73 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.04 kB-0.01%-1 B 🔽
@sentry/aws-serverless83.26 kB--
@sentry/cloudflare (withSentry) - minified181.47 kB--
@sentry/cloudflare (withSentry)448.98 kB--

View base workflow run

@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7f4e38 to 35bcc80CompareJuly 8, 2026 17:03
@chargome
chargome marked this pull request as ready for review July 9, 2026 16:13
chargome added a commit that referenced this pull request Jul 10, 2026
Adds an experimental option for opting in to orchestrion
instrumentation.
- Once the opt-in flag is set we:
- Un-externalize the bundle-safe instrumented packages; bundle-unsafe
ones (`mysql`) stay external and are instrumented by the runtime module
hook, which works because we also externalize the `@apm-js-collab/*`
transformer packages.
- `transpilePackages` for the ones that Next externalizes by default
(e.g. `pg`) — removing them from serverExternalPackages isn't enough for
Next's own defaults.
- Inject the code-transform loader as a Turbopack rule and as a webpack
plugin.
- The webpack loader gets exported from our server utils package (which
can be used for turbopack too)
Verified in
[e2e](#22080)
closes#22009
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Base automatically changed from cg/nextjs-orchestrion-support to developJuly 10, 2026 10:53
@chargome
chargome requested review from a team as code ownersJuly 10, 2026 10:53
@chargome
chargome requested review from JPeer264, andreiborza, mydea and s1gr1d and removed request for a teamJuly 10, 2026 10:53
Exercises the experimental useDiagnosticsChannelInjection opt-in on both
Turbopack and webpack builds: ioredis is instrumented via the build-time
loader (bundle-safe allowlist), pg and mysql via the runtime module hook,
asserted through API routes and a dynamically rendered SSR page.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7025ea to 01946a2CompareJuly 10, 2026 11:09
chargomeand others added 2 commits July 10, 2026 13:25
The nextjs-16-orchestrion test app pins the same next@16.2.3 as the other
nextjs-16-* E2E apps; dependency review only scans newly added manifests,
so the pre-existing pin surfaces on this PR.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Resolves the dependency-review failures on the newly added manifest (all
flagged high-severity advisories are patched in 16.2.6+), instead of
allowlisting the 16.2.3 GHSAs.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, thanks for adding this.

@timfishtimfish left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Would be good to get this merged before the weekend!

@andreiborza
andreiborza merged commit 1ff32f9 into developJul 10, 2026
47 checks passed
@andreiborza
andreiborza deleted the cg/nextjs-orchestrion-e2e branch July 10, 2026 14:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add E2E test app for orchestrion instrumentations on Next.js

3 participants

@chargome@timfish@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

test(nextjs): Add orchestrion e2e test app - #22080

Merged
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e
Jul 10, 2026
Merged

test(nextjs): Add orchestrion e2e test app#22080
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e

Conversation

@chargome

@chargomechargome commented Jul 8, 2026

Copy link
Copy Markdown
Member

Adds an e2e test for nextjs-16 with opt-in for orchestrion.

Tests both webpack+turbopack paths

closes#21993

@chargomechargome self-assigned this Jul 8, 2026
@github-actions

github-actionsBot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.6 kB--
@sentry/browser - with treeshaking flags26.04 kB--
@sentry/browser (incl. Tracing)46.35 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.14 kB--
@sentry/browser (incl. Tracing, Profiling)51.13 kB--
@sentry/browser (incl. Tracing, Replay)85.62 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.26 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.33 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)102.99 kB--
@sentry/browser (incl. Feedback)44.78 kB--
@sentry/browser (incl. sendFeedback)32.4 kB--
@sentry/browser (incl. FeedbackAsync)37.53 kB--
@sentry/browser (incl. Metrics)28.68 kB--
@sentry/browser (incl. Logs)28.93 kB--
@sentry/browser (incl. Metrics & Logs)29.61 kB--
@sentry/react29.39 kB--
@sentry/react (incl. Tracing)48.62 kB--
@sentry/vue33.03 kB--
@sentry/vue (incl. Tracing)48.33 kB--
@sentry/svelte27.63 kB--
CDN Bundle30 kB--
CDN Bundle (incl. Tracing)48.33 kB--
CDN Bundle (incl. Logs, Metrics)31.58 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.65 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.82 kB--
CDN Bundle (incl. Tracing, Replay)85.84 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.16 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.64 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)92.92 kB--
CDN Bundle - uncompressed89.33 kB--
CDN Bundle (incl. Tracing) - uncompressed146.07 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.03 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.05 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed218.76 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.28 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.24 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed278.98 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed282.93 kB--
@sentry/nextjs (client)51.17 kB--
@sentry/sveltekit (client)46.8 kB--
@sentry/core/server78.42 kB--
@sentry/core/browser64.77 kB--
@sentry/node-core62.73 kB+0.01%+2 B 🔺
@sentry/node125.35 kB+0.01%+1 B 🔺
@sentry/node (incl. diagnostics channel injection)139.63 kB--
@sentry/node/import (ESM hook with diagnostics-channel injection)69.95 kB--
@sentry/node/light50.73 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.04 kB-0.01%-1 B 🔽
@sentry/aws-serverless83.26 kB--
@sentry/cloudflare (withSentry) - minified181.47 kB--
@sentry/cloudflare (withSentry)448.98 kB--

View base workflow run

@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7f4e38 to 35bcc80CompareJuly 8, 2026 17:03
@chargome
chargome marked this pull request as ready for review July 9, 2026 16:13
chargome added a commit that referenced this pull request Jul 10, 2026
Adds an experimental option for opting in to orchestrion
instrumentation.
- Once the opt-in flag is set we:
- Un-externalize the bundle-safe instrumented packages; bundle-unsafe
ones (`mysql`) stay external and are instrumented by the runtime module
hook, which works because we also externalize the `@apm-js-collab/*`
transformer packages.
- `transpilePackages` for the ones that Next externalizes by default
(e.g. `pg`) — removing them from serverExternalPackages isn't enough for
Next's own defaults.
- Inject the code-transform loader as a Turbopack rule and as a webpack
plugin.
- The webpack loader gets exported from our server utils package (which
can be used for turbopack too)
Verified in
[e2e](#22080)
closes#22009
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Base automatically changed from cg/nextjs-orchestrion-support to developJuly 10, 2026 10:53
@chargome
chargome requested review from a team as code ownersJuly 10, 2026 10:53
@chargome
chargome requested review from JPeer264, andreiborza, mydea and s1gr1d and removed request for a teamJuly 10, 2026 10:53
Exercises the experimental useDiagnosticsChannelInjection opt-in on both
Turbopack and webpack builds: ioredis is instrumented via the build-time
loader (bundle-safe allowlist), pg and mysql via the runtime module hook,
asserted through API routes and a dynamically rendered SSR page.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7025ea to 01946a2CompareJuly 10, 2026 11:09
chargomeand others added 2 commits July 10, 2026 13:25
The nextjs-16-orchestrion test app pins the same next@16.2.3 as the other
nextjs-16-* E2E apps; dependency review only scans newly added manifests,
so the pre-existing pin surfaces on this PR.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Resolves the dependency-review failures on the newly added manifest (all
flagged high-severity advisories are patched in 16.2.6+), instead of
allowlisting the 16.2.3 GHSAs.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, thanks for adding this.

@timfishtimfish left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Would be good to get this merged before the weekend!

@andreiborza
andreiborza merged commit 1ff32f9 into developJul 10, 2026
47 checks passed
@andreiborza
andreiborza deleted the cg/nextjs-orchestrion-e2e branch July 10, 2026 14:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add E2E test app for orchestrion instrumentations on Next.js

3 participants

@chargome@timfish@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test(nextjs): Add orchestrion e2e test app - #22080

Merged
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e
Jul 10, 2026
Merged

test(nextjs): Add orchestrion e2e test app#22080
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e

Conversation

@chargome

@chargomechargome commented Jul 8, 2026

Copy link
Copy Markdown
Member

Adds an e2e test for nextjs-16 with opt-in for orchestrion.

Tests both webpack+turbopack paths

closes#21993

@chargomechargome self-assigned this Jul 8, 2026
@github-actions

github-actionsBot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.6 kB--
@sentry/browser - with treeshaking flags26.04 kB--
@sentry/browser (incl. Tracing)46.35 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.14 kB--
@sentry/browser (incl. Tracing, Profiling)51.13 kB--
@sentry/browser (incl. Tracing, Replay)85.62 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.26 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.33 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)102.99 kB--
@sentry/browser (incl. Feedback)44.78 kB--
@sentry/browser (incl. sendFeedback)32.4 kB--
@sentry/browser (incl. FeedbackAsync)37.53 kB--
@sentry/browser (incl. Metrics)28.68 kB--
@sentry/browser (incl. Logs)28.93 kB--
@sentry/browser (incl. Metrics & Logs)29.61 kB--
@sentry/react29.39 kB--
@sentry/react (incl. Tracing)48.62 kB--
@sentry/vue33.03 kB--
@sentry/vue (incl. Tracing)48.33 kB--
@sentry/svelte27.63 kB--
CDN Bundle30 kB--
CDN Bundle (incl. Tracing)48.33 kB--
CDN Bundle (incl. Logs, Metrics)31.58 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.65 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.82 kB--
CDN Bundle (incl. Tracing, Replay)85.84 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.16 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.64 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)92.92 kB--
CDN Bundle - uncompressed89.33 kB--
CDN Bundle (incl. Tracing) - uncompressed146.07 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.03 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.05 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed218.76 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.28 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.24 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed278.98 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed282.93 kB--
@sentry/nextjs (client)51.17 kB--
@sentry/sveltekit (client)46.8 kB--
@sentry/core/server78.42 kB--
@sentry/core/browser64.77 kB--
@sentry/node-core62.73 kB+0.01%+2 B 🔺
@sentry/node125.35 kB+0.01%+1 B 🔺
@sentry/node (incl. diagnostics channel injection)139.63 kB--
@sentry/node/import (ESM hook with diagnostics-channel injection)69.95 kB--
@sentry/node/light50.73 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.04 kB-0.01%-1 B 🔽
@sentry/aws-serverless83.26 kB--
@sentry/cloudflare (withSentry) - minified181.47 kB--
@sentry/cloudflare (withSentry)448.98 kB--

View base workflow run

@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7f4e38 to 35bcc80CompareJuly 8, 2026 17:03
@chargome
chargome marked this pull request as ready for review July 9, 2026 16:13
chargome added a commit that referenced this pull request Jul 10, 2026
Adds an experimental option for opting in to orchestrion
instrumentation.
- Once the opt-in flag is set we:
- Un-externalize the bundle-safe instrumented packages; bundle-unsafe
ones (`mysql`) stay external and are instrumented by the runtime module
hook, which works because we also externalize the `@apm-js-collab/*`
transformer packages.
- `transpilePackages` for the ones that Next externalizes by default
(e.g. `pg`) — removing them from serverExternalPackages isn't enough for
Next's own defaults.
- Inject the code-transform loader as a Turbopack rule and as a webpack
plugin.
- The webpack loader gets exported from our server utils package (which
can be used for turbopack too)
Verified in
[e2e](#22080)
closes#22009
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Base automatically changed from cg/nextjs-orchestrion-support to developJuly 10, 2026 10:53
@chargome
chargome requested review from a team as code ownersJuly 10, 2026 10:53
@chargome
chargome requested review from JPeer264, andreiborza, mydea and s1gr1d and removed request for a teamJuly 10, 2026 10:53
Exercises the experimental useDiagnosticsChannelInjection opt-in on both
Turbopack and webpack builds: ioredis is instrumented via the build-time
loader (bundle-safe allowlist), pg and mysql via the runtime module hook,
asserted through API routes and a dynamically rendered SSR page.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7025ea to 01946a2CompareJuly 10, 2026 11:09
chargomeand others added 2 commits July 10, 2026 13:25
The nextjs-16-orchestrion test app pins the same next@16.2.3 as the other
nextjs-16-* E2E apps; dependency review only scans newly added manifests,
so the pre-existing pin surfaces on this PR.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Resolves the dependency-review failures on the newly added manifest (all
flagged high-severity advisories are patched in 16.2.6+), instead of
allowlisting the 16.2.3 GHSAs.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, thanks for adding this.

@timfishtimfish left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Would be good to get this merged before the weekend!

@andreiborza
andreiborza merged commit 1ff32f9 into developJul 10, 2026
47 checks passed
@andreiborza
andreiborza deleted the cg/nextjs-orchestrion-e2e branch July 10, 2026 14:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add E2E test app for orchestrion instrumentations on Next.js

3 participants

@chargome@timfish@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test(nextjs): Add orchestrion e2e test app - #22080

Merged
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e
Jul 10, 2026
Merged

test(nextjs): Add orchestrion e2e test app#22080
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e

Conversation

@chargome

@chargomechargome commented Jul 8, 2026

Copy link
Copy Markdown
Member

Adds an e2e test for nextjs-16 with opt-in for orchestrion.

Tests both webpack+turbopack paths

closes#21993

@chargomechargome self-assigned this Jul 8, 2026
@github-actions

github-actionsBot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.6 kB--
@sentry/browser - with treeshaking flags26.04 kB--
@sentry/browser (incl. Tracing)46.35 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.14 kB--
@sentry/browser (incl. Tracing, Profiling)51.13 kB--
@sentry/browser (incl. Tracing, Replay)85.62 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.26 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.33 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)102.99 kB--
@sentry/browser (incl. Feedback)44.78 kB--
@sentry/browser (incl. sendFeedback)32.4 kB--
@sentry/browser (incl. FeedbackAsync)37.53 kB--
@sentry/browser (incl. Metrics)28.68 kB--
@sentry/browser (incl. Logs)28.93 kB--
@sentry/browser (incl. Metrics & Logs)29.61 kB--
@sentry/react29.39 kB--
@sentry/react (incl. Tracing)48.62 kB--
@sentry/vue33.03 kB--
@sentry/vue (incl. Tracing)48.33 kB--
@sentry/svelte27.63 kB--
CDN Bundle30 kB--
CDN Bundle (incl. Tracing)48.33 kB--
CDN Bundle (incl. Logs, Metrics)31.58 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.65 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.82 kB--
CDN Bundle (incl. Tracing, Replay)85.84 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.16 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.64 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)92.92 kB--
CDN Bundle - uncompressed89.33 kB--
CDN Bundle (incl. Tracing) - uncompressed146.07 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.03 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.05 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed218.76 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.28 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.24 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed278.98 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed282.93 kB--
@sentry/nextjs (client)51.17 kB--
@sentry/sveltekit (client)46.8 kB--
@sentry/core/server78.42 kB--
@sentry/core/browser64.77 kB--
@sentry/node-core62.73 kB+0.01%+2 B 🔺
@sentry/node125.35 kB+0.01%+1 B 🔺
@sentry/node (incl. diagnostics channel injection)139.63 kB--
@sentry/node/import (ESM hook with diagnostics-channel injection)69.95 kB--
@sentry/node/light50.73 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.04 kB-0.01%-1 B 🔽
@sentry/aws-serverless83.26 kB--
@sentry/cloudflare (withSentry) - minified181.47 kB--
@sentry/cloudflare (withSentry)448.98 kB--

View base workflow run

@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7f4e38 to 35bcc80CompareJuly 8, 2026 17:03
@chargome
chargome marked this pull request as ready for review July 9, 2026 16:13
chargome added a commit that referenced this pull request Jul 10, 2026
Adds an experimental option for opting in to orchestrion
instrumentation.
- Once the opt-in flag is set we:
- Un-externalize the bundle-safe instrumented packages; bundle-unsafe
ones (`mysql`) stay external and are instrumented by the runtime module
hook, which works because we also externalize the `@apm-js-collab/*`
transformer packages.
- `transpilePackages` for the ones that Next externalizes by default
(e.g. `pg`) — removing them from serverExternalPackages isn't enough for
Next's own defaults.
- Inject the code-transform loader as a Turbopack rule and as a webpack
plugin.
- The webpack loader gets exported from our server utils package (which
can be used for turbopack too)
Verified in
[e2e](#22080)
closes#22009
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Base automatically changed from cg/nextjs-orchestrion-support to developJuly 10, 2026 10:53
@chargome
chargome requested review from a team as code ownersJuly 10, 2026 10:53
@chargome
chargome requested review from JPeer264, andreiborza, mydea and s1gr1d and removed request for a teamJuly 10, 2026 10:53
Exercises the experimental useDiagnosticsChannelInjection opt-in on both
Turbopack and webpack builds: ioredis is instrumented via the build-time
loader (bundle-safe allowlist), pg and mysql via the runtime module hook,
asserted through API routes and a dynamically rendered SSR page.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7025ea to 01946a2CompareJuly 10, 2026 11:09
chargomeand others added 2 commits July 10, 2026 13:25
The nextjs-16-orchestrion test app pins the same next@16.2.3 as the other
nextjs-16-* E2E apps; dependency review only scans newly added manifests,
so the pre-existing pin surfaces on this PR.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Resolves the dependency-review failures on the newly added manifest (all
flagged high-severity advisories are patched in 16.2.6+), instead of
allowlisting the 16.2.3 GHSAs.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, thanks for adding this.

@timfishtimfish left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Would be good to get this merged before the weekend!

@andreiborza
andreiborza merged commit 1ff32f9 into developJul 10, 2026
47 checks passed
@andreiborza
andreiborza deleted the cg/nextjs-orchestrion-e2e branch July 10, 2026 14:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add E2E test app for orchestrion instrumentations on Next.js

3 participants

@chargome@timfish@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

test(nextjs): Add orchestrion e2e test app - #22080

Merged
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e
Jul 10, 2026
Merged

test(nextjs): Add orchestrion e2e test app#22080
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e

Conversation

@chargome

@chargomechargome commented Jul 8, 2026

Copy link
Copy Markdown
Member

Adds an e2e test for nextjs-16 with opt-in for orchestrion.

Tests both webpack+turbopack paths

closes#21993

@chargomechargome self-assigned this Jul 8, 2026
@github-actions

github-actionsBot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.6 kB--
@sentry/browser - with treeshaking flags26.04 kB--
@sentry/browser (incl. Tracing)46.35 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.14 kB--
@sentry/browser (incl. Tracing, Profiling)51.13 kB--
@sentry/browser (incl. Tracing, Replay)85.62 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.26 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.33 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)102.99 kB--
@sentry/browser (incl. Feedback)44.78 kB--
@sentry/browser (incl. sendFeedback)32.4 kB--
@sentry/browser (incl. FeedbackAsync)37.53 kB--
@sentry/browser (incl. Metrics)28.68 kB--
@sentry/browser (incl. Logs)28.93 kB--
@sentry/browser (incl. Metrics & Logs)29.61 kB--
@sentry/react29.39 kB--
@sentry/react (incl. Tracing)48.62 kB--
@sentry/vue33.03 kB--
@sentry/vue (incl. Tracing)48.33 kB--
@sentry/svelte27.63 kB--
CDN Bundle30 kB--
CDN Bundle (incl. Tracing)48.33 kB--
CDN Bundle (incl. Logs, Metrics)31.58 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.65 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.82 kB--
CDN Bundle (incl. Tracing, Replay)85.84 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.16 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.64 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)92.92 kB--
CDN Bundle - uncompressed89.33 kB--
CDN Bundle (incl. Tracing) - uncompressed146.07 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.03 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.05 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed218.76 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.28 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.24 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed278.98 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed282.93 kB--
@sentry/nextjs (client)51.17 kB--
@sentry/sveltekit (client)46.8 kB--
@sentry/core/server78.42 kB--
@sentry/core/browser64.77 kB--
@sentry/node-core62.73 kB+0.01%+2 B 🔺
@sentry/node125.35 kB+0.01%+1 B 🔺
@sentry/node (incl. diagnostics channel injection)139.63 kB--
@sentry/node/import (ESM hook with diagnostics-channel injection)69.95 kB--
@sentry/node/light50.73 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.04 kB-0.01%-1 B 🔽
@sentry/aws-serverless83.26 kB--
@sentry/cloudflare (withSentry) - minified181.47 kB--
@sentry/cloudflare (withSentry)448.98 kB--

View base workflow run

@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7f4e38 to 35bcc80CompareJuly 8, 2026 17:03
@chargome
chargome marked this pull request as ready for review July 9, 2026 16:13
chargome added a commit that referenced this pull request Jul 10, 2026
Adds an experimental option for opting in to orchestrion
instrumentation.
- Once the opt-in flag is set we:
- Un-externalize the bundle-safe instrumented packages; bundle-unsafe
ones (`mysql`) stay external and are instrumented by the runtime module
hook, which works because we also externalize the `@apm-js-collab/*`
transformer packages.
- `transpilePackages` for the ones that Next externalizes by default
(e.g. `pg`) — removing them from serverExternalPackages isn't enough for
Next's own defaults.
- Inject the code-transform loader as a Turbopack rule and as a webpack
plugin.
- The webpack loader gets exported from our server utils package (which
can be used for turbopack too)
Verified in
[e2e](#22080)
closes#22009
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Base automatically changed from cg/nextjs-orchestrion-support to developJuly 10, 2026 10:53
@chargome
chargome requested review from a team as code ownersJuly 10, 2026 10:53
@chargome
chargome requested review from JPeer264, andreiborza, mydea and s1gr1d and removed request for a teamJuly 10, 2026 10:53
Exercises the experimental useDiagnosticsChannelInjection opt-in on both
Turbopack and webpack builds: ioredis is instrumented via the build-time
loader (bundle-safe allowlist), pg and mysql via the runtime module hook,
asserted through API routes and a dynamically rendered SSR page.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7025ea to 01946a2CompareJuly 10, 2026 11:09
chargomeand others added 2 commits July 10, 2026 13:25
The nextjs-16-orchestrion test app pins the same next@16.2.3 as the other
nextjs-16-* E2E apps; dependency review only scans newly added manifests,
so the pre-existing pin surfaces on this PR.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Resolves the dependency-review failures on the newly added manifest (all
flagged high-severity advisories are patched in 16.2.6+), instead of
allowlisting the 16.2.3 GHSAs.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, thanks for adding this.

@timfishtimfish left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Would be good to get this merged before the weekend!

@andreiborza
andreiborza merged commit 1ff32f9 into developJul 10, 2026
47 checks passed
@andreiborza
andreiborza deleted the cg/nextjs-orchestrion-e2e branch July 10, 2026 14:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add E2E test app for orchestrion instrumentations on Next.js

3 participants

@chargome@timfish@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test(nextjs): Add orchestrion e2e test app - #22080

Merged
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e
Jul 10, 2026
Merged

test(nextjs): Add orchestrion e2e test app#22080
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e

Conversation

@chargome

@chargomechargome commented Jul 8, 2026

Copy link
Copy Markdown
Member

Adds an e2e test for nextjs-16 with opt-in for orchestrion.

Tests both webpack+turbopack paths

closes#21993

@chargomechargome self-assigned this Jul 8, 2026
@github-actions

github-actionsBot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.6 kB--
@sentry/browser - with treeshaking flags26.04 kB--
@sentry/browser (incl. Tracing)46.35 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.14 kB--
@sentry/browser (incl. Tracing, Profiling)51.13 kB--
@sentry/browser (incl. Tracing, Replay)85.62 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.26 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.33 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)102.99 kB--
@sentry/browser (incl. Feedback)44.78 kB--
@sentry/browser (incl. sendFeedback)32.4 kB--
@sentry/browser (incl. FeedbackAsync)37.53 kB--
@sentry/browser (incl. Metrics)28.68 kB--
@sentry/browser (incl. Logs)28.93 kB--
@sentry/browser (incl. Metrics & Logs)29.61 kB--
@sentry/react29.39 kB--
@sentry/react (incl. Tracing)48.62 kB--
@sentry/vue33.03 kB--
@sentry/vue (incl. Tracing)48.33 kB--
@sentry/svelte27.63 kB--
CDN Bundle30 kB--
CDN Bundle (incl. Tracing)48.33 kB--
CDN Bundle (incl. Logs, Metrics)31.58 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.65 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.82 kB--
CDN Bundle (incl. Tracing, Replay)85.84 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.16 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.64 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)92.92 kB--
CDN Bundle - uncompressed89.33 kB--
CDN Bundle (incl. Tracing) - uncompressed146.07 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.03 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.05 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed218.76 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.28 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.24 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed278.98 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed282.93 kB--
@sentry/nextjs (client)51.17 kB--
@sentry/sveltekit (client)46.8 kB--
@sentry/core/server78.42 kB--
@sentry/core/browser64.77 kB--
@sentry/node-core62.73 kB+0.01%+2 B 🔺
@sentry/node125.35 kB+0.01%+1 B 🔺
@sentry/node (incl. diagnostics channel injection)139.63 kB--
@sentry/node/import (ESM hook with diagnostics-channel injection)69.95 kB--
@sentry/node/light50.73 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.04 kB-0.01%-1 B 🔽
@sentry/aws-serverless83.26 kB--
@sentry/cloudflare (withSentry) - minified181.47 kB--
@sentry/cloudflare (withSentry)448.98 kB--

View base workflow run

@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7f4e38 to 35bcc80CompareJuly 8, 2026 17:03
@chargome
chargome marked this pull request as ready for review July 9, 2026 16:13
chargome added a commit that referenced this pull request Jul 10, 2026
Adds an experimental option for opting in to orchestrion
instrumentation.
- Once the opt-in flag is set we:
- Un-externalize the bundle-safe instrumented packages; bundle-unsafe
ones (`mysql`) stay external and are instrumented by the runtime module
hook, which works because we also externalize the `@apm-js-collab/*`
transformer packages.
- `transpilePackages` for the ones that Next externalizes by default
(e.g. `pg`) — removing them from serverExternalPackages isn't enough for
Next's own defaults.
- Inject the code-transform loader as a Turbopack rule and as a webpack
plugin.
- The webpack loader gets exported from our server utils package (which
can be used for turbopack too)
Verified in
[e2e](#22080)
closes#22009
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Base automatically changed from cg/nextjs-orchestrion-support to developJuly 10, 2026 10:53
@chargome
chargome requested review from a team as code ownersJuly 10, 2026 10:53
@chargome
chargome requested review from JPeer264, andreiborza, mydea and s1gr1d and removed request for a teamJuly 10, 2026 10:53
Exercises the experimental useDiagnosticsChannelInjection opt-in on both
Turbopack and webpack builds: ioredis is instrumented via the build-time
loader (bundle-safe allowlist), pg and mysql via the runtime module hook,
asserted through API routes and a dynamically rendered SSR page.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7025ea to 01946a2CompareJuly 10, 2026 11:09
chargomeand others added 2 commits July 10, 2026 13:25
The nextjs-16-orchestrion test app pins the same next@16.2.3 as the other
nextjs-16-* E2E apps; dependency review only scans newly added manifests,
so the pre-existing pin surfaces on this PR.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Resolves the dependency-review failures on the newly added manifest (all
flagged high-severity advisories are patched in 16.2.6+), instead of
allowlisting the 16.2.3 GHSAs.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, thanks for adding this.

@timfishtimfish left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Would be good to get this merged before the weekend!

@andreiborza
andreiborza merged commit 1ff32f9 into developJul 10, 2026
47 checks passed
@andreiborza
andreiborza deleted the cg/nextjs-orchestrion-e2e branch July 10, 2026 14:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add E2E test app for orchestrion instrumentations on Next.js

3 participants

@chargome@timfish@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

test(nextjs): Add orchestrion e2e test app - #22080

Merged
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e
Jul 10, 2026
Merged

test(nextjs): Add orchestrion e2e test app#22080
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e

Conversation

@chargome

@chargomechargome commented Jul 8, 2026

Copy link
Copy Markdown
Member

Adds an e2e test for nextjs-16 with opt-in for orchestrion.

Tests both webpack+turbopack paths

closes#21993

@chargomechargome self-assigned this Jul 8, 2026
@github-actions

github-actionsBot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.6 kB--
@sentry/browser - with treeshaking flags26.04 kB--
@sentry/browser (incl. Tracing)46.35 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.14 kB--
@sentry/browser (incl. Tracing, Profiling)51.13 kB--
@sentry/browser (incl. Tracing, Replay)85.62 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.26 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.33 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)102.99 kB--
@sentry/browser (incl. Feedback)44.78 kB--
@sentry/browser (incl. sendFeedback)32.4 kB--
@sentry/browser (incl. FeedbackAsync)37.53 kB--
@sentry/browser (incl. Metrics)28.68 kB--
@sentry/browser (incl. Logs)28.93 kB--
@sentry/browser (incl. Metrics & Logs)29.61 kB--
@sentry/react29.39 kB--
@sentry/react (incl. Tracing)48.62 kB--
@sentry/vue33.03 kB--
@sentry/vue (incl. Tracing)48.33 kB--
@sentry/svelte27.63 kB--
CDN Bundle30 kB--
CDN Bundle (incl. Tracing)48.33 kB--
CDN Bundle (incl. Logs, Metrics)31.58 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.65 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.82 kB--
CDN Bundle (incl. Tracing, Replay)85.84 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.16 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.64 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)92.92 kB--
CDN Bundle - uncompressed89.33 kB--
CDN Bundle (incl. Tracing) - uncompressed146.07 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.03 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.05 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed218.76 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.28 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.24 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed278.98 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed282.93 kB--
@sentry/nextjs (client)51.17 kB--
@sentry/sveltekit (client)46.8 kB--
@sentry/core/server78.42 kB--
@sentry/core/browser64.77 kB--
@sentry/node-core62.73 kB+0.01%+2 B 🔺
@sentry/node125.35 kB+0.01%+1 B 🔺
@sentry/node (incl. diagnostics channel injection)139.63 kB--
@sentry/node/import (ESM hook with diagnostics-channel injection)69.95 kB--
@sentry/node/light50.73 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.04 kB-0.01%-1 B 🔽
@sentry/aws-serverless83.26 kB--
@sentry/cloudflare (withSentry) - minified181.47 kB--
@sentry/cloudflare (withSentry)448.98 kB--

View base workflow run

@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7f4e38 to 35bcc80CompareJuly 8, 2026 17:03
@chargome
chargome marked this pull request as ready for review July 9, 2026 16:13
chargome added a commit that referenced this pull request Jul 10, 2026
Adds an experimental option for opting in to orchestrion
instrumentation.
- Once the opt-in flag is set we:
- Un-externalize the bundle-safe instrumented packages; bundle-unsafe
ones (`mysql`) stay external and are instrumented by the runtime module
hook, which works because we also externalize the `@apm-js-collab/*`
transformer packages.
- `transpilePackages` for the ones that Next externalizes by default
(e.g. `pg`) — removing them from serverExternalPackages isn't enough for
Next's own defaults.
- Inject the code-transform loader as a Turbopack rule and as a webpack
plugin.
- The webpack loader gets exported from our server utils package (which
can be used for turbopack too)
Verified in
[e2e](#22080)
closes#22009
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Base automatically changed from cg/nextjs-orchestrion-support to developJuly 10, 2026 10:53
@chargome
chargome requested review from a team as code ownersJuly 10, 2026 10:53
@chargome
chargome requested review from JPeer264, andreiborza, mydea and s1gr1d and removed request for a teamJuly 10, 2026 10:53
Exercises the experimental useDiagnosticsChannelInjection opt-in on both
Turbopack and webpack builds: ioredis is instrumented via the build-time
loader (bundle-safe allowlist), pg and mysql via the runtime module hook,
asserted through API routes and a dynamically rendered SSR page.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7025ea to 01946a2CompareJuly 10, 2026 11:09
chargomeand others added 2 commits July 10, 2026 13:25
The nextjs-16-orchestrion test app pins the same next@16.2.3 as the other
nextjs-16-* E2E apps; dependency review only scans newly added manifests,
so the pre-existing pin surfaces on this PR.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Resolves the dependency-review failures on the newly added manifest (all
flagged high-severity advisories are patched in 16.2.6+), instead of
allowlisting the 16.2.3 GHSAs.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, thanks for adding this.

@timfishtimfish left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Would be good to get this merged before the weekend!

@andreiborza
andreiborza merged commit 1ff32f9 into developJul 10, 2026
47 checks passed
@andreiborza
andreiborza deleted the cg/nextjs-orchestrion-e2e branch July 10, 2026 14:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add E2E test app for orchestrion instrumentations on Next.js

3 participants

@chargome@timfish@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

test(nextjs): Add orchestrion e2e test app - #22080

Merged
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e
Jul 10, 2026
Merged

test(nextjs): Add orchestrion e2e test app#22080
andreiborza merged 3 commits into
developfrom
cg/nextjs-orchestrion-e2e

Conversation

@chargome

@chargomechargome commented Jul 8, 2026

Copy link
Copy Markdown
Member

Adds an e2e test for nextjs-16 with opt-in for orchestrion.

Tests both webpack+turbopack paths

closes#21993

@chargomechargome self-assigned this Jul 8, 2026
@github-actions

github-actionsBot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.6 kB--
@sentry/browser - with treeshaking flags26.04 kB--
@sentry/browser (incl. Tracing)46.35 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.14 kB--
@sentry/browser (incl. Tracing, Profiling)51.13 kB--
@sentry/browser (incl. Tracing, Replay)85.62 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.26 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.33 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)102.99 kB--
@sentry/browser (incl. Feedback)44.78 kB--
@sentry/browser (incl. sendFeedback)32.4 kB--
@sentry/browser (incl. FeedbackAsync)37.53 kB--
@sentry/browser (incl. Metrics)28.68 kB--
@sentry/browser (incl. Logs)28.93 kB--
@sentry/browser (incl. Metrics & Logs)29.61 kB--
@sentry/react29.39 kB--
@sentry/react (incl. Tracing)48.62 kB--
@sentry/vue33.03 kB--
@sentry/vue (incl. Tracing)48.33 kB--
@sentry/svelte27.63 kB--
CDN Bundle30 kB--
CDN Bundle (incl. Tracing)48.33 kB--
CDN Bundle (incl. Logs, Metrics)31.58 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.65 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.82 kB--
CDN Bundle (incl. Tracing, Replay)85.84 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.16 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.64 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)92.92 kB--
CDN Bundle - uncompressed89.33 kB--
CDN Bundle (incl. Tracing) - uncompressed146.07 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.03 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.05 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed218.76 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.28 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.24 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed278.98 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed282.93 kB--
@sentry/nextjs (client)51.17 kB--
@sentry/sveltekit (client)46.8 kB--
@sentry/core/server78.42 kB--
@sentry/core/browser64.77 kB--
@sentry/node-core62.73 kB+0.01%+2 B 🔺
@sentry/node125.35 kB+0.01%+1 B 🔺
@sentry/node (incl. diagnostics channel injection)139.63 kB--
@sentry/node/import (ESM hook with diagnostics-channel injection)69.95 kB--
@sentry/node/light50.73 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.04 kB-0.01%-1 B 🔽
@sentry/aws-serverless83.26 kB--
@sentry/cloudflare (withSentry) - minified181.47 kB--
@sentry/cloudflare (withSentry)448.98 kB--

View base workflow run

@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7f4e38 to 35bcc80CompareJuly 8, 2026 17:03
@chargome
chargome marked this pull request as ready for review July 9, 2026 16:13
chargome added a commit that referenced this pull request Jul 10, 2026
Adds an experimental option for opting in to orchestrion
instrumentation.
- Once the opt-in flag is set we:
- Un-externalize the bundle-safe instrumented packages; bundle-unsafe
ones (`mysql`) stay external and are instrumented by the runtime module
hook, which works because we also externalize the `@apm-js-collab/*`
transformer packages.
- `transpilePackages` for the ones that Next externalizes by default
(e.g. `pg`) — removing them from serverExternalPackages isn't enough for
Next's own defaults.
- Inject the code-transform loader as a Turbopack rule and as a webpack
plugin.
- The webpack loader gets exported from our server utils package (which
can be used for turbopack too)
Verified in
[e2e](#22080)
closes#22009
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Base automatically changed from cg/nextjs-orchestrion-support to developJuly 10, 2026 10:53
@chargome
chargome requested review from a team as code ownersJuly 10, 2026 10:53
@chargome
chargome requested review from JPeer264, andreiborza, mydea and s1gr1d and removed request for a teamJuly 10, 2026 10:53
Exercises the experimental useDiagnosticsChannelInjection opt-in on both
Turbopack and webpack builds: ioredis is instrumented via the build-time
loader (bundle-safe allowlist), pg and mysql via the runtime module hook,
asserted through API routes and a dynamically rendered SSR page.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@chargome
chargomeforce-pushed the cg/nextjs-orchestrion-e2e branch from a7025ea to 01946a2CompareJuly 10, 2026 11:09
chargomeand others added 2 commits July 10, 2026 13:25
The nextjs-16-orchestrion test app pins the same next@16.2.3 as the other
nextjs-16-* E2E apps; dependency review only scans newly added manifests,
so the pre-existing pin surfaces on this PR.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Resolves the dependency-review failures on the newly added manifest (all
flagged high-severity advisories are patched in 16.2.6+), instead of
allowlisting the 16.2.3 GHSAs.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, thanks for adding this.

@timfishtimfish left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Would be good to get this merged before the weekend!

@andreiborza
andreiborza merged commit 1ff32f9 into developJul 10, 2026
47 checks passed
@andreiborza
andreiborza deleted the cg/nextjs-orchestrion-e2e branch July 10, 2026 14:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add E2E test app for orchestrion instrumentations on Next.js

3 participants

@chargome@timfish@andreiborza