feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in - #22143

Merged
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless
Jul 16, 2026
Merged

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in#22143
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless

Conversation

@andreiborza

@andreiborzaandreiborza commented Jul 9, 2026

Copy link
Copy Markdown
Member

Wires the orchestrion aws-sdk channel integration into @sentry/aws-serverless, where the OTel Aws integration ships as a default today.

@sentry/node exposes a reusable applyDiagnosticsChannelInjectionIntegrations helper (extracted from its getDefaultIntegrations), and @sentry/aws-serverless uses it to swap the OTel Aws integration for the channel version when the app opts in via experimentalUseDiagnosticsChannelInjection() (now re-exported from the aws-serverless SDK). No change when the opt-in isn't used.

The existing aws-integration node-integration-tests assert the swapped origin via isOrchestrionEnabled(), so both the OTel and diagnostics-channel paths are covered by the same suites across both smithy stacks (latest + legacy 3.1041.0) and ESM/CJS. Only the expected origin is parametrized.

Part of #20946

Comment threadpackages/aws-serverless/src/init.ts
@github-actions

github-actionsBot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.74 kB--
@sentry/browser - with treeshaking flags26.19 kB--
@sentry/browser (incl. Tracing)46.57 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.36 kB--
@sentry/browser (incl. Tracing, Profiling)51.34 kB--
@sentry/browser (incl. Tracing, Replay)85.83 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.46 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.55 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)103.18 kB--
@sentry/browser (incl. Feedback)44.92 kB--
@sentry/browser (incl. sendFeedback)32.54 kB--
@sentry/browser (incl. FeedbackAsync)37.67 kB--
@sentry/browser (incl. Metrics)28.84 kB--
@sentry/browser (incl. Logs)29.07 kB--
@sentry/browser (incl. Metrics & Logs)29.76 kB--
@sentry/react29.54 kB--
@sentry/react (incl. Tracing)48.82 kB--
@sentry/vue33.17 kB--
@sentry/vue (incl. Tracing)48.55 kB--
@sentry/svelte27.77 kB--
CDN Bundle30.14 kB--
CDN Bundle (incl. Tracing)48.52 kB--
CDN Bundle (incl. Logs, Metrics)31.72 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.83 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.97 kB--
CDN Bundle (incl. Tracing, Replay)86.04 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.33 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)93.09 kB--
CDN Bundle - uncompressed89.85 kB--
CDN Bundle (incl. Tracing) - uncompressed146.66 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.56 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.64 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed219.28 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.86 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed279.56 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed283.52 kB--
@sentry/nextjs (client)51.38 kB--
@sentry/sveltekit (client)47 kB--
@sentry/core/server78.71 kB--
@sentry/core/browser65.08 kB--
@sentry/node-core63.21 kB--
@sentry/node125.45 kB--
@sentry/node (incl. diagnostics channel injection)145.67 kB+2.15%+3.07 kB 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection)70.03 kB-0.01%-2 B 🔽
@sentry/node/light51.33 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.7 kB+0.01%+2 B 🔺
@sentry/aws-serverless83.92 kB--
@sentry/cloudflare (withSentry) - minified182.1 kB--
@sentry/cloudflare (withSentry)450.9 kB--

View base workflow run

@andreiborza
andreiborza changed the base branch from ab/aws-sdk-server-utils to ab/aws-sdk-messagingJuly 9, 2026 21:22
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from bdc838e to 9297436CompareJuly 9, 2026 21:35
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 9297436 to 31816fdCompareJuly 9, 2026 21:44
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 0b89e37 to a3978faCompareJuly 9, 2026 22:11
Comment threadpackages/aws-serverless/src/init.ts
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from a3978fa to 809da29CompareJuly 9, 2026 22:14
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 809da29 to 8907ff9CompareJuly 9, 2026 22:31
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8907ff9 to c0e10d6CompareJuly 9, 2026 22:46
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from c0e10d6 to 561e41bCompareJuly 9, 2026 22:55
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 561e41b to 8ffb46bCompareJuly 9, 2026 23:02
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8ffb46b to 556da6fCompareJuly 10, 2026 07:40
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 556da6f to 9f3cab7CompareJuly 10, 2026 12:14
// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

@andreiborzaandreiborzaJul 15, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This goes a bit against the default path where we don't load performance integrations, but since orchestrion is an opt-in feature this seems fine for now.

We will re-evaluate when we work on v11.

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

On develop we currently only include integrations without performance + aws lambda + aws sdk integrations. Here we straight up just include everything.

This is fine for the transition period but once we switch this over we should configure it the same way to not actually include everything out of the box, i.e. we should follow the same path as is currently. This is a bit cumbersome to do on v10 but shouldn't be a problem in v11.

@andreiborza

andreiborza commented Jul 15, 2026

Copy link
Copy Markdown
MemberAuthor

batman begin

@cursorcursorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 58a581d. Configure here.

@andreiborza
andreiborza marked this pull request as ready for review July 15, 2026 13:17
@andreiborza
andreiborza requested review from a team as code ownersJuly 15, 2026 13:17
@andreiborza
andreiborza requested review from JPeer264, isaacs and mydea and removed request for a teamJuly 15, 2026 13:17
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from d00cea8 to aa8192cCompareJuly 15, 2026 13:37
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 19a3e72 to aa8192cCompareJuly 15, 2026 13:54
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from f3c38b1 to aa8192cCompareJuly 15, 2026 14:49
Comment threadpackages/aws-serverless/src/init.ts
spanStreamingIntegration,
withStreamedSpan,
experimentalUseDiagnosticsChannelInjection,
diagnosticsChannelInjectionIntegrations,

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.

q: why do we need to export this? like what use case does this cover

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is needed to handle the different inits that the aws-serverless sdk has (i.e. npm aws init and aws layer init). It can be removed again in v11, it's just an awkward workaround right now. Similar to the other comment I left on this PR around init.

// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

* produce nothing but spans, so this is gated on span recording. Exported so SDKs that build their
* own default-integration set can apply the same logic instead of duplicating it.
*/
export function applyDiagnosticsChannelInjectionIntegrations(

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.

l: we have very similar logic in the node init, should we refactor this to reuse this function?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This basically disappears in v11, I think it's not worth extracting it now.

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.

fair enough

Comment threadpackages/aws-serverless/src/init.ts
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.

2 participants

@andreiborza@nicohrubec
, '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

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in - #22143

Merged
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless
Jul 16, 2026
Merged

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in#22143
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless

Conversation

@andreiborza

@andreiborzaandreiborza commented Jul 9, 2026

Copy link
Copy Markdown
Member

Wires the orchestrion aws-sdk channel integration into @sentry/aws-serverless, where the OTel Aws integration ships as a default today.

@sentry/node exposes a reusable applyDiagnosticsChannelInjectionIntegrations helper (extracted from its getDefaultIntegrations), and @sentry/aws-serverless uses it to swap the OTel Aws integration for the channel version when the app opts in via experimentalUseDiagnosticsChannelInjection() (now re-exported from the aws-serverless SDK). No change when the opt-in isn't used.

The existing aws-integration node-integration-tests assert the swapped origin via isOrchestrionEnabled(), so both the OTel and diagnostics-channel paths are covered by the same suites across both smithy stacks (latest + legacy 3.1041.0) and ESM/CJS. Only the expected origin is parametrized.

Part of #20946

Comment threadpackages/aws-serverless/src/init.ts
@github-actions

github-actionsBot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.74 kB--
@sentry/browser - with treeshaking flags26.19 kB--
@sentry/browser (incl. Tracing)46.57 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.36 kB--
@sentry/browser (incl. Tracing, Profiling)51.34 kB--
@sentry/browser (incl. Tracing, Replay)85.83 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.46 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.55 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)103.18 kB--
@sentry/browser (incl. Feedback)44.92 kB--
@sentry/browser (incl. sendFeedback)32.54 kB--
@sentry/browser (incl. FeedbackAsync)37.67 kB--
@sentry/browser (incl. Metrics)28.84 kB--
@sentry/browser (incl. Logs)29.07 kB--
@sentry/browser (incl. Metrics & Logs)29.76 kB--
@sentry/react29.54 kB--
@sentry/react (incl. Tracing)48.82 kB--
@sentry/vue33.17 kB--
@sentry/vue (incl. Tracing)48.55 kB--
@sentry/svelte27.77 kB--
CDN Bundle30.14 kB--
CDN Bundle (incl. Tracing)48.52 kB--
CDN Bundle (incl. Logs, Metrics)31.72 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.83 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.97 kB--
CDN Bundle (incl. Tracing, Replay)86.04 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.33 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)93.09 kB--
CDN Bundle - uncompressed89.85 kB--
CDN Bundle (incl. Tracing) - uncompressed146.66 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.56 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.64 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed219.28 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.86 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed279.56 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed283.52 kB--
@sentry/nextjs (client)51.38 kB--
@sentry/sveltekit (client)47 kB--
@sentry/core/server78.71 kB--
@sentry/core/browser65.08 kB--
@sentry/node-core63.21 kB--
@sentry/node125.45 kB--
@sentry/node (incl. diagnostics channel injection)145.67 kB+2.15%+3.07 kB 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection)70.03 kB-0.01%-2 B 🔽
@sentry/node/light51.33 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.7 kB+0.01%+2 B 🔺
@sentry/aws-serverless83.92 kB--
@sentry/cloudflare (withSentry) - minified182.1 kB--
@sentry/cloudflare (withSentry)450.9 kB--

View base workflow run

@andreiborza
andreiborza changed the base branch from ab/aws-sdk-server-utils to ab/aws-sdk-messagingJuly 9, 2026 21:22
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from bdc838e to 9297436CompareJuly 9, 2026 21:35
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 9297436 to 31816fdCompareJuly 9, 2026 21:44
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 0b89e37 to a3978faCompareJuly 9, 2026 22:11
Comment threadpackages/aws-serverless/src/init.ts
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from a3978fa to 809da29CompareJuly 9, 2026 22:14
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 809da29 to 8907ff9CompareJuly 9, 2026 22:31
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8907ff9 to c0e10d6CompareJuly 9, 2026 22:46
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from c0e10d6 to 561e41bCompareJuly 9, 2026 22:55
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 561e41b to 8ffb46bCompareJuly 9, 2026 23:02
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8ffb46b to 556da6fCompareJuly 10, 2026 07:40
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 556da6f to 9f3cab7CompareJuly 10, 2026 12:14
// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

@andreiborzaandreiborzaJul 15, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This goes a bit against the default path where we don't load performance integrations, but since orchestrion is an opt-in feature this seems fine for now.

We will re-evaluate when we work on v11.

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

On develop we currently only include integrations without performance + aws lambda + aws sdk integrations. Here we straight up just include everything.

This is fine for the transition period but once we switch this over we should configure it the same way to not actually include everything out of the box, i.e. we should follow the same path as is currently. This is a bit cumbersome to do on v10 but shouldn't be a problem in v11.

@andreiborza

andreiborza commented Jul 15, 2026

Copy link
Copy Markdown
MemberAuthor

batman begin

@cursorcursorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 58a581d. Configure here.

@andreiborza
andreiborza marked this pull request as ready for review July 15, 2026 13:17
@andreiborza
andreiborza requested review from a team as code ownersJuly 15, 2026 13:17
@andreiborza
andreiborza requested review from JPeer264, isaacs and mydea and removed request for a teamJuly 15, 2026 13:17
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from d00cea8 to aa8192cCompareJuly 15, 2026 13:37
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 19a3e72 to aa8192cCompareJuly 15, 2026 13:54
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from f3c38b1 to aa8192cCompareJuly 15, 2026 14:49
Comment threadpackages/aws-serverless/src/init.ts
spanStreamingIntegration,
withStreamedSpan,
experimentalUseDiagnosticsChannelInjection,
diagnosticsChannelInjectionIntegrations,

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.

q: why do we need to export this? like what use case does this cover

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is needed to handle the different inits that the aws-serverless sdk has (i.e. npm aws init and aws layer init). It can be removed again in v11, it's just an awkward workaround right now. Similar to the other comment I left on this PR around init.

// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

* produce nothing but spans, so this is gated on span recording. Exported so SDKs that build their
* own default-integration set can apply the same logic instead of duplicating it.
*/
export function applyDiagnosticsChannelInjectionIntegrations(

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.

l: we have very similar logic in the node init, should we refactor this to reuse this function?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This basically disappears in v11, I think it's not worth extracting it now.

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.

fair enough

Comment threadpackages/aws-serverless/src/init.ts
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.

2 participants

@andreiborza@nicohrubec
, '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

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in - #22143

Merged
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless
Jul 16, 2026
Merged

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in#22143
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless

Conversation

@andreiborza

@andreiborzaandreiborza commented Jul 9, 2026

Copy link
Copy Markdown
Member

Wires the orchestrion aws-sdk channel integration into @sentry/aws-serverless, where the OTel Aws integration ships as a default today.

@sentry/node exposes a reusable applyDiagnosticsChannelInjectionIntegrations helper (extracted from its getDefaultIntegrations), and @sentry/aws-serverless uses it to swap the OTel Aws integration for the channel version when the app opts in via experimentalUseDiagnosticsChannelInjection() (now re-exported from the aws-serverless SDK). No change when the opt-in isn't used.

The existing aws-integration node-integration-tests assert the swapped origin via isOrchestrionEnabled(), so both the OTel and diagnostics-channel paths are covered by the same suites across both smithy stacks (latest + legacy 3.1041.0) and ESM/CJS. Only the expected origin is parametrized.

Part of #20946

Comment threadpackages/aws-serverless/src/init.ts
@github-actions

github-actionsBot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.74 kB--
@sentry/browser - with treeshaking flags26.19 kB--
@sentry/browser (incl. Tracing)46.57 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.36 kB--
@sentry/browser (incl. Tracing, Profiling)51.34 kB--
@sentry/browser (incl. Tracing, Replay)85.83 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.46 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.55 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)103.18 kB--
@sentry/browser (incl. Feedback)44.92 kB--
@sentry/browser (incl. sendFeedback)32.54 kB--
@sentry/browser (incl. FeedbackAsync)37.67 kB--
@sentry/browser (incl. Metrics)28.84 kB--
@sentry/browser (incl. Logs)29.07 kB--
@sentry/browser (incl. Metrics & Logs)29.76 kB--
@sentry/react29.54 kB--
@sentry/react (incl. Tracing)48.82 kB--
@sentry/vue33.17 kB--
@sentry/vue (incl. Tracing)48.55 kB--
@sentry/svelte27.77 kB--
CDN Bundle30.14 kB--
CDN Bundle (incl. Tracing)48.52 kB--
CDN Bundle (incl. Logs, Metrics)31.72 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.83 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.97 kB--
CDN Bundle (incl. Tracing, Replay)86.04 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.33 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)93.09 kB--
CDN Bundle - uncompressed89.85 kB--
CDN Bundle (incl. Tracing) - uncompressed146.66 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.56 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.64 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed219.28 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.86 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed279.56 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed283.52 kB--
@sentry/nextjs (client)51.38 kB--
@sentry/sveltekit (client)47 kB--
@sentry/core/server78.71 kB--
@sentry/core/browser65.08 kB--
@sentry/node-core63.21 kB--
@sentry/node125.45 kB--
@sentry/node (incl. diagnostics channel injection)145.67 kB+2.15%+3.07 kB 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection)70.03 kB-0.01%-2 B 🔽
@sentry/node/light51.33 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.7 kB+0.01%+2 B 🔺
@sentry/aws-serverless83.92 kB--
@sentry/cloudflare (withSentry) - minified182.1 kB--
@sentry/cloudflare (withSentry)450.9 kB--

View base workflow run

@andreiborza
andreiborza changed the base branch from ab/aws-sdk-server-utils to ab/aws-sdk-messagingJuly 9, 2026 21:22
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from bdc838e to 9297436CompareJuly 9, 2026 21:35
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 9297436 to 31816fdCompareJuly 9, 2026 21:44
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 0b89e37 to a3978faCompareJuly 9, 2026 22:11
Comment threadpackages/aws-serverless/src/init.ts
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from a3978fa to 809da29CompareJuly 9, 2026 22:14
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 809da29 to 8907ff9CompareJuly 9, 2026 22:31
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8907ff9 to c0e10d6CompareJuly 9, 2026 22:46
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from c0e10d6 to 561e41bCompareJuly 9, 2026 22:55
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 561e41b to 8ffb46bCompareJuly 9, 2026 23:02
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8ffb46b to 556da6fCompareJuly 10, 2026 07:40
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 556da6f to 9f3cab7CompareJuly 10, 2026 12:14
// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

@andreiborzaandreiborzaJul 15, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This goes a bit against the default path where we don't load performance integrations, but since orchestrion is an opt-in feature this seems fine for now.

We will re-evaluate when we work on v11.

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

On develop we currently only include integrations without performance + aws lambda + aws sdk integrations. Here we straight up just include everything.

This is fine for the transition period but once we switch this over we should configure it the same way to not actually include everything out of the box, i.e. we should follow the same path as is currently. This is a bit cumbersome to do on v10 but shouldn't be a problem in v11.

@andreiborza

andreiborza commented Jul 15, 2026

Copy link
Copy Markdown
MemberAuthor

batman begin

@cursorcursorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 58a581d. Configure here.

@andreiborza
andreiborza marked this pull request as ready for review July 15, 2026 13:17
@andreiborza
andreiborza requested review from a team as code ownersJuly 15, 2026 13:17
@andreiborza
andreiborza requested review from JPeer264, isaacs and mydea and removed request for a teamJuly 15, 2026 13:17
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from d00cea8 to aa8192cCompareJuly 15, 2026 13:37
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 19a3e72 to aa8192cCompareJuly 15, 2026 13:54
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from f3c38b1 to aa8192cCompareJuly 15, 2026 14:49
Comment threadpackages/aws-serverless/src/init.ts
spanStreamingIntegration,
withStreamedSpan,
experimentalUseDiagnosticsChannelInjection,
diagnosticsChannelInjectionIntegrations,

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.

q: why do we need to export this? like what use case does this cover

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is needed to handle the different inits that the aws-serverless sdk has (i.e. npm aws init and aws layer init). It can be removed again in v11, it's just an awkward workaround right now. Similar to the other comment I left on this PR around init.

// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

* produce nothing but spans, so this is gated on span recording. Exported so SDKs that build their
* own default-integration set can apply the same logic instead of duplicating it.
*/
export function applyDiagnosticsChannelInjectionIntegrations(

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.

l: we have very similar logic in the node init, should we refactor this to reuse this function?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This basically disappears in v11, I think it's not worth extracting it now.

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.

fair enough

Comment threadpackages/aws-serverless/src/init.ts
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.

2 participants

@andreiborza@nicohrubec
, '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

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in - #22143

Merged
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless
Jul 16, 2026
Merged

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in#22143
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless

Conversation

@andreiborza

@andreiborzaandreiborza commented Jul 9, 2026

Copy link
Copy Markdown
Member

Wires the orchestrion aws-sdk channel integration into @sentry/aws-serverless, where the OTel Aws integration ships as a default today.

@sentry/node exposes a reusable applyDiagnosticsChannelInjectionIntegrations helper (extracted from its getDefaultIntegrations), and @sentry/aws-serverless uses it to swap the OTel Aws integration for the channel version when the app opts in via experimentalUseDiagnosticsChannelInjection() (now re-exported from the aws-serverless SDK). No change when the opt-in isn't used.

The existing aws-integration node-integration-tests assert the swapped origin via isOrchestrionEnabled(), so both the OTel and diagnostics-channel paths are covered by the same suites across both smithy stacks (latest + legacy 3.1041.0) and ESM/CJS. Only the expected origin is parametrized.

Part of #20946

Comment threadpackages/aws-serverless/src/init.ts
@github-actions

github-actionsBot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.74 kB--
@sentry/browser - with treeshaking flags26.19 kB--
@sentry/browser (incl. Tracing)46.57 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.36 kB--
@sentry/browser (incl. Tracing, Profiling)51.34 kB--
@sentry/browser (incl. Tracing, Replay)85.83 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.46 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.55 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)103.18 kB--
@sentry/browser (incl. Feedback)44.92 kB--
@sentry/browser (incl. sendFeedback)32.54 kB--
@sentry/browser (incl. FeedbackAsync)37.67 kB--
@sentry/browser (incl. Metrics)28.84 kB--
@sentry/browser (incl. Logs)29.07 kB--
@sentry/browser (incl. Metrics & Logs)29.76 kB--
@sentry/react29.54 kB--
@sentry/react (incl. Tracing)48.82 kB--
@sentry/vue33.17 kB--
@sentry/vue (incl. Tracing)48.55 kB--
@sentry/svelte27.77 kB--
CDN Bundle30.14 kB--
CDN Bundle (incl. Tracing)48.52 kB--
CDN Bundle (incl. Logs, Metrics)31.72 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.83 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.97 kB--
CDN Bundle (incl. Tracing, Replay)86.04 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.33 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)93.09 kB--
CDN Bundle - uncompressed89.85 kB--
CDN Bundle (incl. Tracing) - uncompressed146.66 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.56 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.64 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed219.28 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.86 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed279.56 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed283.52 kB--
@sentry/nextjs (client)51.38 kB--
@sentry/sveltekit (client)47 kB--
@sentry/core/server78.71 kB--
@sentry/core/browser65.08 kB--
@sentry/node-core63.21 kB--
@sentry/node125.45 kB--
@sentry/node (incl. diagnostics channel injection)145.67 kB+2.15%+3.07 kB 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection)70.03 kB-0.01%-2 B 🔽
@sentry/node/light51.33 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.7 kB+0.01%+2 B 🔺
@sentry/aws-serverless83.92 kB--
@sentry/cloudflare (withSentry) - minified182.1 kB--
@sentry/cloudflare (withSentry)450.9 kB--

View base workflow run

@andreiborza
andreiborza changed the base branch from ab/aws-sdk-server-utils to ab/aws-sdk-messagingJuly 9, 2026 21:22
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from bdc838e to 9297436CompareJuly 9, 2026 21:35
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 9297436 to 31816fdCompareJuly 9, 2026 21:44
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 0b89e37 to a3978faCompareJuly 9, 2026 22:11
Comment threadpackages/aws-serverless/src/init.ts
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from a3978fa to 809da29CompareJuly 9, 2026 22:14
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 809da29 to 8907ff9CompareJuly 9, 2026 22:31
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8907ff9 to c0e10d6CompareJuly 9, 2026 22:46
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from c0e10d6 to 561e41bCompareJuly 9, 2026 22:55
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 561e41b to 8ffb46bCompareJuly 9, 2026 23:02
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8ffb46b to 556da6fCompareJuly 10, 2026 07:40
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 556da6f to 9f3cab7CompareJuly 10, 2026 12:14
// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

@andreiborzaandreiborzaJul 15, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This goes a bit against the default path where we don't load performance integrations, but since orchestrion is an opt-in feature this seems fine for now.

We will re-evaluate when we work on v11.

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

On develop we currently only include integrations without performance + aws lambda + aws sdk integrations. Here we straight up just include everything.

This is fine for the transition period but once we switch this over we should configure it the same way to not actually include everything out of the box, i.e. we should follow the same path as is currently. This is a bit cumbersome to do on v10 but shouldn't be a problem in v11.

@andreiborza

andreiborza commented Jul 15, 2026

Copy link
Copy Markdown
MemberAuthor

batman begin

@cursorcursorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 58a581d. Configure here.

@andreiborza
andreiborza marked this pull request as ready for review July 15, 2026 13:17
@andreiborza
andreiborza requested review from a team as code ownersJuly 15, 2026 13:17
@andreiborza
andreiborza requested review from JPeer264, isaacs and mydea and removed request for a teamJuly 15, 2026 13:17
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from d00cea8 to aa8192cCompareJuly 15, 2026 13:37
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 19a3e72 to aa8192cCompareJuly 15, 2026 13:54
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from f3c38b1 to aa8192cCompareJuly 15, 2026 14:49
Comment threadpackages/aws-serverless/src/init.ts
spanStreamingIntegration,
withStreamedSpan,
experimentalUseDiagnosticsChannelInjection,
diagnosticsChannelInjectionIntegrations,

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.

q: why do we need to export this? like what use case does this cover

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is needed to handle the different inits that the aws-serverless sdk has (i.e. npm aws init and aws layer init). It can be removed again in v11, it's just an awkward workaround right now. Similar to the other comment I left on this PR around init.

// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

* produce nothing but spans, so this is gated on span recording. Exported so SDKs that build their
* own default-integration set can apply the same logic instead of duplicating it.
*/
export function applyDiagnosticsChannelInjectionIntegrations(

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.

l: we have very similar logic in the node init, should we refactor this to reuse this function?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This basically disappears in v11, I think it's not worth extracting it now.

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.

fair enough

Comment threadpackages/aws-serverless/src/init.ts
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.

2 participants

@andreiborza@nicohrubec
, '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

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in - #22143

Merged
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless
Jul 16, 2026
Merged

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in#22143
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless

Conversation

@andreiborza

@andreiborzaandreiborza commented Jul 9, 2026

Copy link
Copy Markdown
Member

Wires the orchestrion aws-sdk channel integration into @sentry/aws-serverless, where the OTel Aws integration ships as a default today.

@sentry/node exposes a reusable applyDiagnosticsChannelInjectionIntegrations helper (extracted from its getDefaultIntegrations), and @sentry/aws-serverless uses it to swap the OTel Aws integration for the channel version when the app opts in via experimentalUseDiagnosticsChannelInjection() (now re-exported from the aws-serverless SDK). No change when the opt-in isn't used.

The existing aws-integration node-integration-tests assert the swapped origin via isOrchestrionEnabled(), so both the OTel and diagnostics-channel paths are covered by the same suites across both smithy stacks (latest + legacy 3.1041.0) and ESM/CJS. Only the expected origin is parametrized.

Part of #20946

Comment threadpackages/aws-serverless/src/init.ts
@github-actions

github-actionsBot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.74 kB--
@sentry/browser - with treeshaking flags26.19 kB--
@sentry/browser (incl. Tracing)46.57 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.36 kB--
@sentry/browser (incl. Tracing, Profiling)51.34 kB--
@sentry/browser (incl. Tracing, Replay)85.83 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.46 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.55 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)103.18 kB--
@sentry/browser (incl. Feedback)44.92 kB--
@sentry/browser (incl. sendFeedback)32.54 kB--
@sentry/browser (incl. FeedbackAsync)37.67 kB--
@sentry/browser (incl. Metrics)28.84 kB--
@sentry/browser (incl. Logs)29.07 kB--
@sentry/browser (incl. Metrics & Logs)29.76 kB--
@sentry/react29.54 kB--
@sentry/react (incl. Tracing)48.82 kB--
@sentry/vue33.17 kB--
@sentry/vue (incl. Tracing)48.55 kB--
@sentry/svelte27.77 kB--
CDN Bundle30.14 kB--
CDN Bundle (incl. Tracing)48.52 kB--
CDN Bundle (incl. Logs, Metrics)31.72 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.83 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.97 kB--
CDN Bundle (incl. Tracing, Replay)86.04 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.33 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)93.09 kB--
CDN Bundle - uncompressed89.85 kB--
CDN Bundle (incl. Tracing) - uncompressed146.66 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.56 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.64 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed219.28 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.86 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed279.56 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed283.52 kB--
@sentry/nextjs (client)51.38 kB--
@sentry/sveltekit (client)47 kB--
@sentry/core/server78.71 kB--
@sentry/core/browser65.08 kB--
@sentry/node-core63.21 kB--
@sentry/node125.45 kB--
@sentry/node (incl. diagnostics channel injection)145.67 kB+2.15%+3.07 kB 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection)70.03 kB-0.01%-2 B 🔽
@sentry/node/light51.33 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.7 kB+0.01%+2 B 🔺
@sentry/aws-serverless83.92 kB--
@sentry/cloudflare (withSentry) - minified182.1 kB--
@sentry/cloudflare (withSentry)450.9 kB--

View base workflow run

@andreiborza
andreiborza changed the base branch from ab/aws-sdk-server-utils to ab/aws-sdk-messagingJuly 9, 2026 21:22
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from bdc838e to 9297436CompareJuly 9, 2026 21:35
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 9297436 to 31816fdCompareJuly 9, 2026 21:44
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 0b89e37 to a3978faCompareJuly 9, 2026 22:11
Comment threadpackages/aws-serverless/src/init.ts
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from a3978fa to 809da29CompareJuly 9, 2026 22:14
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 809da29 to 8907ff9CompareJuly 9, 2026 22:31
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8907ff9 to c0e10d6CompareJuly 9, 2026 22:46
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from c0e10d6 to 561e41bCompareJuly 9, 2026 22:55
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 561e41b to 8ffb46bCompareJuly 9, 2026 23:02
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8ffb46b to 556da6fCompareJuly 10, 2026 07:40
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 556da6f to 9f3cab7CompareJuly 10, 2026 12:14
// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

@andreiborzaandreiborzaJul 15, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This goes a bit against the default path where we don't load performance integrations, but since orchestrion is an opt-in feature this seems fine for now.

We will re-evaluate when we work on v11.

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

On develop we currently only include integrations without performance + aws lambda + aws sdk integrations. Here we straight up just include everything.

This is fine for the transition period but once we switch this over we should configure it the same way to not actually include everything out of the box, i.e. we should follow the same path as is currently. This is a bit cumbersome to do on v10 but shouldn't be a problem in v11.

@andreiborza

andreiborza commented Jul 15, 2026

Copy link
Copy Markdown
MemberAuthor

batman begin

@cursorcursorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 58a581d. Configure here.

@andreiborza
andreiborza marked this pull request as ready for review July 15, 2026 13:17
@andreiborza
andreiborza requested review from a team as code ownersJuly 15, 2026 13:17
@andreiborza
andreiborza requested review from JPeer264, isaacs and mydea and removed request for a teamJuly 15, 2026 13:17
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from d00cea8 to aa8192cCompareJuly 15, 2026 13:37
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 19a3e72 to aa8192cCompareJuly 15, 2026 13:54
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from f3c38b1 to aa8192cCompareJuly 15, 2026 14:49
Comment threadpackages/aws-serverless/src/init.ts
spanStreamingIntegration,
withStreamedSpan,
experimentalUseDiagnosticsChannelInjection,
diagnosticsChannelInjectionIntegrations,

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.

q: why do we need to export this? like what use case does this cover

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is needed to handle the different inits that the aws-serverless sdk has (i.e. npm aws init and aws layer init). It can be removed again in v11, it's just an awkward workaround right now. Similar to the other comment I left on this PR around init.

// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

* produce nothing but spans, so this is gated on span recording. Exported so SDKs that build their
* own default-integration set can apply the same logic instead of duplicating it.
*/
export function applyDiagnosticsChannelInjectionIntegrations(

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.

l: we have very similar logic in the node init, should we refactor this to reuse this function?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This basically disappears in v11, I think it's not worth extracting it now.

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.

fair enough

Comment threadpackages/aws-serverless/src/init.ts
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.

2 participants

@andreiborza@nicohrubec
, '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

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in - #22143

Merged
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless
Jul 16, 2026
Merged

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in#22143
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless

Conversation

@andreiborza

@andreiborzaandreiborza commented Jul 9, 2026

Copy link
Copy Markdown
Member

Wires the orchestrion aws-sdk channel integration into @sentry/aws-serverless, where the OTel Aws integration ships as a default today.

@sentry/node exposes a reusable applyDiagnosticsChannelInjectionIntegrations helper (extracted from its getDefaultIntegrations), and @sentry/aws-serverless uses it to swap the OTel Aws integration for the channel version when the app opts in via experimentalUseDiagnosticsChannelInjection() (now re-exported from the aws-serverless SDK). No change when the opt-in isn't used.

The existing aws-integration node-integration-tests assert the swapped origin via isOrchestrionEnabled(), so both the OTel and diagnostics-channel paths are covered by the same suites across both smithy stacks (latest + legacy 3.1041.0) and ESM/CJS. Only the expected origin is parametrized.

Part of #20946

Comment threadpackages/aws-serverless/src/init.ts
@github-actions

github-actionsBot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.74 kB--
@sentry/browser - with treeshaking flags26.19 kB--
@sentry/browser (incl. Tracing)46.57 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.36 kB--
@sentry/browser (incl. Tracing, Profiling)51.34 kB--
@sentry/browser (incl. Tracing, Replay)85.83 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.46 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.55 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)103.18 kB--
@sentry/browser (incl. Feedback)44.92 kB--
@sentry/browser (incl. sendFeedback)32.54 kB--
@sentry/browser (incl. FeedbackAsync)37.67 kB--
@sentry/browser (incl. Metrics)28.84 kB--
@sentry/browser (incl. Logs)29.07 kB--
@sentry/browser (incl. Metrics & Logs)29.76 kB--
@sentry/react29.54 kB--
@sentry/react (incl. Tracing)48.82 kB--
@sentry/vue33.17 kB--
@sentry/vue (incl. Tracing)48.55 kB--
@sentry/svelte27.77 kB--
CDN Bundle30.14 kB--
CDN Bundle (incl. Tracing)48.52 kB--
CDN Bundle (incl. Logs, Metrics)31.72 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.83 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.97 kB--
CDN Bundle (incl. Tracing, Replay)86.04 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.33 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)93.09 kB--
CDN Bundle - uncompressed89.85 kB--
CDN Bundle (incl. Tracing) - uncompressed146.66 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.56 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.64 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed219.28 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.86 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed279.56 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed283.52 kB--
@sentry/nextjs (client)51.38 kB--
@sentry/sveltekit (client)47 kB--
@sentry/core/server78.71 kB--
@sentry/core/browser65.08 kB--
@sentry/node-core63.21 kB--
@sentry/node125.45 kB--
@sentry/node (incl. diagnostics channel injection)145.67 kB+2.15%+3.07 kB 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection)70.03 kB-0.01%-2 B 🔽
@sentry/node/light51.33 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.7 kB+0.01%+2 B 🔺
@sentry/aws-serverless83.92 kB--
@sentry/cloudflare (withSentry) - minified182.1 kB--
@sentry/cloudflare (withSentry)450.9 kB--

View base workflow run

@andreiborza
andreiborza changed the base branch from ab/aws-sdk-server-utils to ab/aws-sdk-messagingJuly 9, 2026 21:22
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from bdc838e to 9297436CompareJuly 9, 2026 21:35
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 9297436 to 31816fdCompareJuly 9, 2026 21:44
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 0b89e37 to a3978faCompareJuly 9, 2026 22:11
Comment threadpackages/aws-serverless/src/init.ts
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from a3978fa to 809da29CompareJuly 9, 2026 22:14
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 809da29 to 8907ff9CompareJuly 9, 2026 22:31
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8907ff9 to c0e10d6CompareJuly 9, 2026 22:46
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from c0e10d6 to 561e41bCompareJuly 9, 2026 22:55
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 561e41b to 8ffb46bCompareJuly 9, 2026 23:02
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8ffb46b to 556da6fCompareJuly 10, 2026 07:40
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 556da6f to 9f3cab7CompareJuly 10, 2026 12:14
// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

@andreiborzaandreiborzaJul 15, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This goes a bit against the default path where we don't load performance integrations, but since orchestrion is an opt-in feature this seems fine for now.

We will re-evaluate when we work on v11.

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

On develop we currently only include integrations without performance + aws lambda + aws sdk integrations. Here we straight up just include everything.

This is fine for the transition period but once we switch this over we should configure it the same way to not actually include everything out of the box, i.e. we should follow the same path as is currently. This is a bit cumbersome to do on v10 but shouldn't be a problem in v11.

@andreiborza

andreiborza commented Jul 15, 2026

Copy link
Copy Markdown
MemberAuthor

batman begin

@cursorcursorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 58a581d. Configure here.

@andreiborza
andreiborza marked this pull request as ready for review July 15, 2026 13:17
@andreiborza
andreiborza requested review from a team as code ownersJuly 15, 2026 13:17
@andreiborza
andreiborza requested review from JPeer264, isaacs and mydea and removed request for a teamJuly 15, 2026 13:17
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from d00cea8 to aa8192cCompareJuly 15, 2026 13:37
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 19a3e72 to aa8192cCompareJuly 15, 2026 13:54
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from f3c38b1 to aa8192cCompareJuly 15, 2026 14:49
Comment threadpackages/aws-serverless/src/init.ts
spanStreamingIntegration,
withStreamedSpan,
experimentalUseDiagnosticsChannelInjection,
diagnosticsChannelInjectionIntegrations,

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.

q: why do we need to export this? like what use case does this cover

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is needed to handle the different inits that the aws-serverless sdk has (i.e. npm aws init and aws layer init). It can be removed again in v11, it's just an awkward workaround right now. Similar to the other comment I left on this PR around init.

// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

* produce nothing but spans, so this is gated on span recording. Exported so SDKs that build their
* own default-integration set can apply the same logic instead of duplicating it.
*/
export function applyDiagnosticsChannelInjectionIntegrations(

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.

l: we have very similar logic in the node init, should we refactor this to reuse this function?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This basically disappears in v11, I think it's not worth extracting it now.

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.

fair enough

Comment threadpackages/aws-serverless/src/init.ts
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.

2 participants

@andreiborza@nicohrubec
, '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

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in - #22143

Merged
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless
Jul 16, 2026
Merged

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in#22143
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless

Conversation

@andreiborza

@andreiborzaandreiborza commented Jul 9, 2026

Copy link
Copy Markdown
Member

Wires the orchestrion aws-sdk channel integration into @sentry/aws-serverless, where the OTel Aws integration ships as a default today.

@sentry/node exposes a reusable applyDiagnosticsChannelInjectionIntegrations helper (extracted from its getDefaultIntegrations), and @sentry/aws-serverless uses it to swap the OTel Aws integration for the channel version when the app opts in via experimentalUseDiagnosticsChannelInjection() (now re-exported from the aws-serverless SDK). No change when the opt-in isn't used.

The existing aws-integration node-integration-tests assert the swapped origin via isOrchestrionEnabled(), so both the OTel and diagnostics-channel paths are covered by the same suites across both smithy stacks (latest + legacy 3.1041.0) and ESM/CJS. Only the expected origin is parametrized.

Part of #20946

Comment threadpackages/aws-serverless/src/init.ts
@github-actions

github-actionsBot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.74 kB--
@sentry/browser - with treeshaking flags26.19 kB--
@sentry/browser (incl. Tracing)46.57 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.36 kB--
@sentry/browser (incl. Tracing, Profiling)51.34 kB--
@sentry/browser (incl. Tracing, Replay)85.83 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.46 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.55 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)103.18 kB--
@sentry/browser (incl. Feedback)44.92 kB--
@sentry/browser (incl. sendFeedback)32.54 kB--
@sentry/browser (incl. FeedbackAsync)37.67 kB--
@sentry/browser (incl. Metrics)28.84 kB--
@sentry/browser (incl. Logs)29.07 kB--
@sentry/browser (incl. Metrics & Logs)29.76 kB--
@sentry/react29.54 kB--
@sentry/react (incl. Tracing)48.82 kB--
@sentry/vue33.17 kB--
@sentry/vue (incl. Tracing)48.55 kB--
@sentry/svelte27.77 kB--
CDN Bundle30.14 kB--
CDN Bundle (incl. Tracing)48.52 kB--
CDN Bundle (incl. Logs, Metrics)31.72 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.83 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.97 kB--
CDN Bundle (incl. Tracing, Replay)86.04 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.33 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)93.09 kB--
CDN Bundle - uncompressed89.85 kB--
CDN Bundle (incl. Tracing) - uncompressed146.66 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.56 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.64 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed219.28 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.86 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed279.56 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed283.52 kB--
@sentry/nextjs (client)51.38 kB--
@sentry/sveltekit (client)47 kB--
@sentry/core/server78.71 kB--
@sentry/core/browser65.08 kB--
@sentry/node-core63.21 kB--
@sentry/node125.45 kB--
@sentry/node (incl. diagnostics channel injection)145.67 kB+2.15%+3.07 kB 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection)70.03 kB-0.01%-2 B 🔽
@sentry/node/light51.33 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.7 kB+0.01%+2 B 🔺
@sentry/aws-serverless83.92 kB--
@sentry/cloudflare (withSentry) - minified182.1 kB--
@sentry/cloudflare (withSentry)450.9 kB--

View base workflow run

@andreiborza
andreiborza changed the base branch from ab/aws-sdk-server-utils to ab/aws-sdk-messagingJuly 9, 2026 21:22
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from bdc838e to 9297436CompareJuly 9, 2026 21:35
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 9297436 to 31816fdCompareJuly 9, 2026 21:44
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 0b89e37 to a3978faCompareJuly 9, 2026 22:11
Comment threadpackages/aws-serverless/src/init.ts
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from a3978fa to 809da29CompareJuly 9, 2026 22:14
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 809da29 to 8907ff9CompareJuly 9, 2026 22:31
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8907ff9 to c0e10d6CompareJuly 9, 2026 22:46
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from c0e10d6 to 561e41bCompareJuly 9, 2026 22:55
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 561e41b to 8ffb46bCompareJuly 9, 2026 23:02
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8ffb46b to 556da6fCompareJuly 10, 2026 07:40
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 556da6f to 9f3cab7CompareJuly 10, 2026 12:14
// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

@andreiborzaandreiborzaJul 15, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This goes a bit against the default path where we don't load performance integrations, but since orchestrion is an opt-in feature this seems fine for now.

We will re-evaluate when we work on v11.

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

On develop we currently only include integrations without performance + aws lambda + aws sdk integrations. Here we straight up just include everything.

This is fine for the transition period but once we switch this over we should configure it the same way to not actually include everything out of the box, i.e. we should follow the same path as is currently. This is a bit cumbersome to do on v10 but shouldn't be a problem in v11.

@andreiborza

andreiborza commented Jul 15, 2026

Copy link
Copy Markdown
MemberAuthor

batman begin

@cursorcursorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 58a581d. Configure here.

@andreiborza
andreiborza marked this pull request as ready for review July 15, 2026 13:17
@andreiborza
andreiborza requested review from a team as code ownersJuly 15, 2026 13:17
@andreiborza
andreiborza requested review from JPeer264, isaacs and mydea and removed request for a teamJuly 15, 2026 13:17
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from d00cea8 to aa8192cCompareJuly 15, 2026 13:37
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 19a3e72 to aa8192cCompareJuly 15, 2026 13:54
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from f3c38b1 to aa8192cCompareJuly 15, 2026 14:49
Comment threadpackages/aws-serverless/src/init.ts
spanStreamingIntegration,
withStreamedSpan,
experimentalUseDiagnosticsChannelInjection,
diagnosticsChannelInjectionIntegrations,

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.

q: why do we need to export this? like what use case does this cover

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is needed to handle the different inits that the aws-serverless sdk has (i.e. npm aws init and aws layer init). It can be removed again in v11, it's just an awkward workaround right now. Similar to the other comment I left on this PR around init.

// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

* produce nothing but spans, so this is gated on span recording. Exported so SDKs that build their
* own default-integration set can apply the same logic instead of duplicating it.
*/
export function applyDiagnosticsChannelInjectionIntegrations(

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.

l: we have very similar logic in the node init, should we refactor this to reuse this function?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This basically disappears in v11, I think it's not worth extracting it now.

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.

fair enough

Comment threadpackages/aws-serverless/src/init.ts
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.

2 participants

@andreiborza@nicohrubec
, '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

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in - #22143

Merged
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless
Jul 16, 2026
Merged

feat(aws-serverless): Use orchestrion aws-sdk integration under diagnostics-channel opt-in#22143
andreiborza merged 1 commit into
ab/aws-sdk-messagingfrom
ab/aws-sdk-serverless

Conversation

@andreiborza

@andreiborzaandreiborza commented Jul 9, 2026

Copy link
Copy Markdown
Member

Wires the orchestrion aws-sdk channel integration into @sentry/aws-serverless, where the OTel Aws integration ships as a default today.

@sentry/node exposes a reusable applyDiagnosticsChannelInjectionIntegrations helper (extracted from its getDefaultIntegrations), and @sentry/aws-serverless uses it to swap the OTel Aws integration for the channel version when the app opts in via experimentalUseDiagnosticsChannelInjection() (now re-exported from the aws-serverless SDK). No change when the opt-in isn't used.

The existing aws-integration node-integration-tests assert the swapped origin via isOrchestrionEnabled(), so both the OTel and diagnostics-channel paths are covered by the same suites across both smithy stacks (latest + legacy 3.1041.0) and ESM/CJS. Only the expected origin is parametrized.

Part of #20946

Comment threadpackages/aws-serverless/src/init.ts
@github-actions

github-actionsBot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser27.74 kB--
@sentry/browser - with treeshaking flags26.19 kB--
@sentry/browser (incl. Tracing)46.57 kB--
@sentry/browser (incl. Tracing + Span Streaming)48.36 kB--
@sentry/browser (incl. Tracing, Profiling)51.34 kB--
@sentry/browser (incl. Tracing, Replay)85.83 kB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags75.46 kB--
@sentry/browser (incl. Tracing, Replay with Canvas)90.55 kB--
@sentry/browser (incl. Tracing, Replay, Feedback)103.18 kB--
@sentry/browser (incl. Feedback)44.92 kB--
@sentry/browser (incl. sendFeedback)32.54 kB--
@sentry/browser (incl. FeedbackAsync)37.67 kB--
@sentry/browser (incl. Metrics)28.84 kB--
@sentry/browser (incl. Logs)29.07 kB--
@sentry/browser (incl. Metrics & Logs)29.76 kB--
@sentry/react29.54 kB--
@sentry/react (incl. Tracing)48.82 kB--
@sentry/vue33.17 kB--
@sentry/vue (incl. Tracing)48.55 kB--
@sentry/svelte27.77 kB--
CDN Bundle30.14 kB--
CDN Bundle (incl. Tracing)48.52 kB--
CDN Bundle (incl. Logs, Metrics)31.72 kB--
CDN Bundle (incl. Tracing, Logs, Metrics)49.83 kB--
CDN Bundle (incl. Replay, Logs, Metrics)70.97 kB--
CDN Bundle (incl. Tracing, Replay)86.04 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics)87.33 kB--
CDN Bundle (incl. Tracing, Replay, Feedback)91.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)93.09 kB--
CDN Bundle - uncompressed89.85 kB--
CDN Bundle (incl. Tracing) - uncompressed146.66 kB--
CDN Bundle (incl. Logs, Metrics) - uncompressed94.56 kB--
CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed150.64 kB--
CDN Bundle (incl. Replay, Logs, Metrics) - uncompressed219.28 kB--
CDN Bundle (incl. Tracing, Replay) - uncompressed265.86 kB--
CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed269.82 kB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed279.56 kB--
CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics) - uncompressed283.52 kB--
@sentry/nextjs (client)51.38 kB--
@sentry/sveltekit (client)47 kB--
@sentry/core/server78.71 kB--
@sentry/core/browser65.08 kB--
@sentry/node-core63.21 kB--
@sentry/node125.45 kB--
@sentry/node (incl. diagnostics channel injection)145.67 kB+2.15%+3.07 kB 🔺
@sentry/node/import (ESM hook with diagnostics-channel injection)70.03 kB-0.01%-2 B 🔽
@sentry/node/light51.33 kB-0.01%-1 B 🔽
@sentry/node - without tracing74.7 kB+0.01%+2 B 🔺
@sentry/aws-serverless83.92 kB--
@sentry/cloudflare (withSentry) - minified182.1 kB--
@sentry/cloudflare (withSentry)450.9 kB--

View base workflow run

@andreiborza
andreiborza changed the base branch from ab/aws-sdk-server-utils to ab/aws-sdk-messagingJuly 9, 2026 21:22
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from bdc838e to 9297436CompareJuly 9, 2026 21:35
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 9297436 to 31816fdCompareJuly 9, 2026 21:44
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 0b89e37 to a3978faCompareJuly 9, 2026 22:11
Comment threadpackages/aws-serverless/src/init.ts
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from a3978fa to 809da29CompareJuly 9, 2026 22:14
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 809da29 to 8907ff9CompareJuly 9, 2026 22:31
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8907ff9 to c0e10d6CompareJuly 9, 2026 22:46
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from c0e10d6 to 561e41bCompareJuly 9, 2026 22:55
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 561e41b to 8ffb46bCompareJuly 9, 2026 23:02
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 8ffb46b to 556da6fCompareJuly 10, 2026 07:40
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch from 556da6f to 9f3cab7CompareJuly 10, 2026 12:14
// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

@andreiborzaandreiborzaJul 15, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This goes a bit against the default path where we don't load performance integrations, but since orchestrion is an opt-in feature this seems fine for now.

We will re-evaluate when we work on v11.

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

On develop we currently only include integrations without performance + aws lambda + aws sdk integrations. Here we straight up just include everything.

This is fine for the transition period but once we switch this over we should configure it the same way to not actually include everything out of the box, i.e. we should follow the same path as is currently. This is a bit cumbersome to do on v10 but shouldn't be a problem in v11.

@andreiborza

andreiborza commented Jul 15, 2026

Copy link
Copy Markdown
MemberAuthor

batman begin

@cursorcursorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 58a581d. Configure here.

@andreiborza
andreiborza marked this pull request as ready for review July 15, 2026 13:17
@andreiborza
andreiborza requested review from a team as code ownersJuly 15, 2026 13:17
@andreiborza
andreiborza requested review from JPeer264, isaacs and mydea and removed request for a teamJuly 15, 2026 13:17
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from d00cea8 to aa8192cCompareJuly 15, 2026 13:37
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from 19a3e72 to aa8192cCompareJuly 15, 2026 13:54
@andreiborza
andreiborzaforce-pushed the ab/aws-sdk-serverless branch 2 times, most recently from f3c38b1 to aa8192cCompareJuly 15, 2026 14:49
Comment threadpackages/aws-serverless/src/init.ts
spanStreamingIntegration,
withStreamedSpan,
experimentalUseDiagnosticsChannelInjection,
diagnosticsChannelInjectionIntegrations,

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.

q: why do we need to export this? like what use case does this cover

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is needed to handle the different inits that the aws-serverless sdk has (i.e. npm aws init and aws layer init). It can be removed again in v11, it's just an awkward workaround right now. Similar to the other comment I left on this PR around init.

// its channel-based equivalent AND the full channel-integration set is appended (mysql, postgres,
// express, ...), giving opted-in apps performance coverage this SDK's defaults otherwise omit.
// No-op otherwise.
return applyDiagnosticsChannelInjectionIntegrations(integrations, options);

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.

what do you mean by this? the integrations that we load are the same before and after iiuc

* produce nothing but spans, so this is gated on span recording. Exported so SDKs that build their
* own default-integration set can apply the same logic instead of duplicating it.
*/
export function applyDiagnosticsChannelInjectionIntegrations(

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.

l: we have very similar logic in the node init, should we refactor this to reuse this function?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This basically disappears in v11, I think it's not worth extracting it now.

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.

fair enough

Comment threadpackages/aws-serverless/src/init.ts
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.

2 participants

@andreiborza@nicohrubec