feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts - #17972

Merged
andreiborza merged 9 commits into
developfrom
disable-integrations
Nov 12, 2025
Merged

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts#17972
andreiborza merged 9 commits into
developfrom
disable-integrations

Conversation

@RulaKhaled

@RulaKhaledRulaKhaled commented Oct 20, 2025

Copy link
Copy Markdown
Collaborator

When using higher-level integrations that wrap underlying libraries, both the wrapper integration and the underlying library integration can instrument the same API calls, resulting in duplicate spans. This is particularly problematic for:

  • LangChain wrapping AI providers (OpenAI, Anthropic, Google GenAI)
  • Any future integrations that wrap other instrumented libraries

The disabled integrations mechanism can be used as follows:

// Any integration can disable others to prevent conflictsimport{disableIntegrations,isIntegrationDisabled}from'@sentry/node-core';// In higher-level integration's setupOnce():disableIntegrations('LowerLevelIntegration');// In integration setupOnce() is not called for the disabled integrations 

and is used in LangChain to auto disable OpenAI, Anthropic AI, and Google GenAI integrations in setupOnce().

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser24.6 kB+0.01%+1 B 🔺
@sentry/browser - with treeshaking flags23.09 kB+0.01%+2 B 🔺
@sentry/browser (incl. Tracing)41.23 kB--
@sentry/browser (incl. Tracing, Profiling)45.51 kB--
@sentry/browser (incl. Tracing, Replay)79.7 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags69.38 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay with Canvas)84.39 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay, Feedback)96.56 kB-0.01%-5 B 🔽
@sentry/browser (incl. Feedback)41.27 kB-0.01%-4 B 🔽
@sentry/browser (incl. sendFeedback)29.27 kB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)34.19 kB-0.01%-3 B 🔽
@sentry/react26.28 kB-0.02%-3 B 🔽
@sentry/react (incl. Tracing)43.2 kB+0.01%+2 B 🔺
@sentry/vue29.08 kB+0.01%+1 B 🔺
@sentry/vue (incl. Tracing)43.01 kB+0.01%+1 B 🔺
@sentry/svelte24.61 kB+0.01%+1 B 🔺
CDN Bundle26.9 kB+0.02%+3 B 🔺
CDN Bundle (incl. Tracing)41.78 kB+0.01%+1 B 🔺
CDN Bundle (incl. Tracing, Replay)78.31 kB+0.01%+2 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback)83.78 kB+0.01%+3 B 🔺
CDN Bundle - uncompressed78.86 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing) - uncompressed123.96 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay) - uncompressed239.99 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed252.75 kB-0.01%-4 B 🔽
@sentry/nextjs (client)45.32 kB+0.01%+4 B 🔺
@sentry/sveltekit (client)41.62 kB--
@sentry/node-core50.81 kB+0.1%+47 B 🔺
@sentry/node157.99 kB+0.09%+141 B 🔺
@sentry/node - without tracing92.69 kB+0.05%+46 B 🔺
@sentry/aws-serverless106.45 kB+0.05%+46 B 🔺

View base workflow run

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

node-overhead report 🧳

Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.

ScenarioRequests/s% of BaselinePrev. Requests/sChange %
GET Baseline9,187-8,690+6%
GET With Sentry1,37815%1,397-1%
GET With Sentry (error only)6,14367%6,120+0%
POST Baseline1,206-1,213-1%
POST With Sentry55346%561-1%
POST With Sentry (error only)1,06188%1,072-1%
MYSQL Baseline3,342-3,363-1%
MYSQL With Sentry49415%482+2%
MYSQL With Sentry (error only)2,68080%2,713-1%

View base workflow run

@RulaKhaled
RulaKhaledforce-pushed the disable-integrations branch 2 times, most recently from 470034b to 31cce57CompareOctober 23, 2025 09:14
@RulaKhaled
RulaKhaled marked this pull request as ready for review October 23, 2025 09:16
Comment threadpackages/node/src/integrations/tracing/langchain/index.ts
@cursor

cursorBot commented Oct 23, 2025

Copy link
Copy Markdown

Bug: Race Condition in AI Provider Setup

A race condition exists where the LangChain integration's setupOnce() method disables other AI provider integrations to prevent duplicate spans. However, if an AI provider's setupOnce() runs before LangChain's due to unpredictable integration setup order, it will instrument itself, leading to duplicate spans that this disabling mechanism intends to prevent.

Fix in CursorFix in Web

@RulaKhaled
RulaKhaled marked this pull request as draft October 23, 2025 12:44
@RulaKhaledRulaKhaled changed the title feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictswip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsOct 23, 2025
@RulaKhaledRulaKhaled changed the title wip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsfeat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsNov 4, 2025
@RulaKhaled
RulaKhaled marked this pull request as ready for review November 4, 2025 15:52

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice! I added some comments regarding the current naming of the functions as they kinda imply a different meaning to what they are actually doing and I think it would be good to give this another look when we expose those functions to our users.

And maybe it's also worth to add some tests

Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/node/src/integrations/tracing/langchain/instrumentation.ts Outdated
@RulaKhaled

Copy link
Copy Markdown
CollaboratorAuthor

@s1gr1d Aside from resolving the comments mentioned above, I made a quick refactor to the PR:

Previously, we unregistered all disabled integrations even if their modules weren’t required at runtime (i.e., when the patch wasn’t fired), which broke AI instrumentations. We also couldn’t have handled marking an integration as disabled in the patch while handling disabling in the setup logic, because that would’ve been too late, the integration would’ve already been registered during setup.

To fix this, I moved the registration of disabled integrations into the patch, ensuring it only happens when the module is actually used. Disabled integrations are now unregistered in _patch(), which serves as a good middle ground for now since we don’t want to require customers to disable integrations manually.

Ideally, we’ll support disabling integrations earlier (at setup time), possibly via lazy loading? but that’s TBD and out of scope for this PR.

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like the changes, thanks!

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The approach we landed on seems okay to me, but I think we should be more specific with the naming of it.

Initially, we planned to disable integrations but after a few iterations we landed on skipping wrapping certain ai providers at runtime. I think we can reflect that change in the naming and really just scope this feature to ai providers.

I'd call the methods:

_skipAiProviderWrapping(providers: string[])_shouldSkipAiProviderWrapping(provider: string)_clearAiProviderSkips()

// (e.g., when LangChain skips OpenAI in one client, but a subsequent client uses OpenAI standalone)
_INTERNAL_clearAiProviderSkips();
super._setupIntegrations();
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Reinit Breaks Instrumentation Skip Logic

Calling _INTERNAL_clearAiProviderSkips() in _setupIntegrations() can cause incorrect instrumentation when Sentry.init() is called multiple times. If LangChain was imported during the first initialization and marked AI providers to skip, a second initialization clears those markers. Since LangChain's _patch won't run again (module already loaded), new AI provider client instances created after the second init will be incorrectly instrumented, even though LangChain is active. The skip markers should persist across client reinitializations or only be cleared when LangChain's patch logic runs.

Fix in CursorFix in Web

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.

This is a limitation of the approach taken, should probably be fine in most cases.

@andreiborza
andreiborza merged commit 2406e90 into developNov 12, 2025
195 checks passed
@andreiborza
andreiborza deleted the disable-integrations branch November 12, 2025 13:06
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.

3 participants

@RulaKhaled@s1gr1d@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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(node-core): Add integration disabling mechanism to prevent instrumentation conflicts - #17972

Merged
andreiborza merged 9 commits into
developfrom
disable-integrations
Nov 12, 2025
Merged

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts#17972
andreiborza merged 9 commits into
developfrom
disable-integrations

Conversation

@RulaKhaled

@RulaKhaledRulaKhaled commented Oct 20, 2025

Copy link
Copy Markdown
Collaborator

When using higher-level integrations that wrap underlying libraries, both the wrapper integration and the underlying library integration can instrument the same API calls, resulting in duplicate spans. This is particularly problematic for:

  • LangChain wrapping AI providers (OpenAI, Anthropic, Google GenAI)
  • Any future integrations that wrap other instrumented libraries

The disabled integrations mechanism can be used as follows:

// Any integration can disable others to prevent conflictsimport{disableIntegrations,isIntegrationDisabled}from'@sentry/node-core';// In higher-level integration's setupOnce():disableIntegrations('LowerLevelIntegration');// In integration setupOnce() is not called for the disabled integrations 

and is used in LangChain to auto disable OpenAI, Anthropic AI, and Google GenAI integrations in setupOnce().

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser24.6 kB+0.01%+1 B 🔺
@sentry/browser - with treeshaking flags23.09 kB+0.01%+2 B 🔺
@sentry/browser (incl. Tracing)41.23 kB--
@sentry/browser (incl. Tracing, Profiling)45.51 kB--
@sentry/browser (incl. Tracing, Replay)79.7 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags69.38 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay with Canvas)84.39 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay, Feedback)96.56 kB-0.01%-5 B 🔽
@sentry/browser (incl. Feedback)41.27 kB-0.01%-4 B 🔽
@sentry/browser (incl. sendFeedback)29.27 kB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)34.19 kB-0.01%-3 B 🔽
@sentry/react26.28 kB-0.02%-3 B 🔽
@sentry/react (incl. Tracing)43.2 kB+0.01%+2 B 🔺
@sentry/vue29.08 kB+0.01%+1 B 🔺
@sentry/vue (incl. Tracing)43.01 kB+0.01%+1 B 🔺
@sentry/svelte24.61 kB+0.01%+1 B 🔺
CDN Bundle26.9 kB+0.02%+3 B 🔺
CDN Bundle (incl. Tracing)41.78 kB+0.01%+1 B 🔺
CDN Bundle (incl. Tracing, Replay)78.31 kB+0.01%+2 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback)83.78 kB+0.01%+3 B 🔺
CDN Bundle - uncompressed78.86 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing) - uncompressed123.96 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay) - uncompressed239.99 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed252.75 kB-0.01%-4 B 🔽
@sentry/nextjs (client)45.32 kB+0.01%+4 B 🔺
@sentry/sveltekit (client)41.62 kB--
@sentry/node-core50.81 kB+0.1%+47 B 🔺
@sentry/node157.99 kB+0.09%+141 B 🔺
@sentry/node - without tracing92.69 kB+0.05%+46 B 🔺
@sentry/aws-serverless106.45 kB+0.05%+46 B 🔺

View base workflow run

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

node-overhead report 🧳

Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.

ScenarioRequests/s% of BaselinePrev. Requests/sChange %
GET Baseline9,187-8,690+6%
GET With Sentry1,37815%1,397-1%
GET With Sentry (error only)6,14367%6,120+0%
POST Baseline1,206-1,213-1%
POST With Sentry55346%561-1%
POST With Sentry (error only)1,06188%1,072-1%
MYSQL Baseline3,342-3,363-1%
MYSQL With Sentry49415%482+2%
MYSQL With Sentry (error only)2,68080%2,713-1%

View base workflow run

@RulaKhaled
RulaKhaledforce-pushed the disable-integrations branch 2 times, most recently from 470034b to 31cce57CompareOctober 23, 2025 09:14
@RulaKhaled
RulaKhaled marked this pull request as ready for review October 23, 2025 09:16
Comment threadpackages/node/src/integrations/tracing/langchain/index.ts
@cursor

cursorBot commented Oct 23, 2025

Copy link
Copy Markdown

Bug: Race Condition in AI Provider Setup

A race condition exists where the LangChain integration's setupOnce() method disables other AI provider integrations to prevent duplicate spans. However, if an AI provider's setupOnce() runs before LangChain's due to unpredictable integration setup order, it will instrument itself, leading to duplicate spans that this disabling mechanism intends to prevent.

Fix in CursorFix in Web

@RulaKhaled
RulaKhaled marked this pull request as draft October 23, 2025 12:44
@RulaKhaledRulaKhaled changed the title feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictswip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsOct 23, 2025
@RulaKhaledRulaKhaled changed the title wip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsfeat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsNov 4, 2025
@RulaKhaled
RulaKhaled marked this pull request as ready for review November 4, 2025 15:52

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice! I added some comments regarding the current naming of the functions as they kinda imply a different meaning to what they are actually doing and I think it would be good to give this another look when we expose those functions to our users.

And maybe it's also worth to add some tests

Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/node/src/integrations/tracing/langchain/instrumentation.ts Outdated
@RulaKhaled

Copy link
Copy Markdown
CollaboratorAuthor

@s1gr1d Aside from resolving the comments mentioned above, I made a quick refactor to the PR:

Previously, we unregistered all disabled integrations even if their modules weren’t required at runtime (i.e., when the patch wasn’t fired), which broke AI instrumentations. We also couldn’t have handled marking an integration as disabled in the patch while handling disabling in the setup logic, because that would’ve been too late, the integration would’ve already been registered during setup.

To fix this, I moved the registration of disabled integrations into the patch, ensuring it only happens when the module is actually used. Disabled integrations are now unregistered in _patch(), which serves as a good middle ground for now since we don’t want to require customers to disable integrations manually.

Ideally, we’ll support disabling integrations earlier (at setup time), possibly via lazy loading? but that’s TBD and out of scope for this PR.

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like the changes, thanks!

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The approach we landed on seems okay to me, but I think we should be more specific with the naming of it.

Initially, we planned to disable integrations but after a few iterations we landed on skipping wrapping certain ai providers at runtime. I think we can reflect that change in the naming and really just scope this feature to ai providers.

I'd call the methods:

_skipAiProviderWrapping(providers: string[])_shouldSkipAiProviderWrapping(provider: string)_clearAiProviderSkips()

// (e.g., when LangChain skips OpenAI in one client, but a subsequent client uses OpenAI standalone)
_INTERNAL_clearAiProviderSkips();
super._setupIntegrations();
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Reinit Breaks Instrumentation Skip Logic

Calling _INTERNAL_clearAiProviderSkips() in _setupIntegrations() can cause incorrect instrumentation when Sentry.init() is called multiple times. If LangChain was imported during the first initialization and marked AI providers to skip, a second initialization clears those markers. Since LangChain's _patch won't run again (module already loaded), new AI provider client instances created after the second init will be incorrectly instrumented, even though LangChain is active. The skip markers should persist across client reinitializations or only be cleared when LangChain's patch logic runs.

Fix in CursorFix in Web

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.

This is a limitation of the approach taken, should probably be fine in most cases.

@andreiborza
andreiborza merged commit 2406e90 into developNov 12, 2025
195 checks passed
@andreiborza
andreiborza deleted the disable-integrations branch November 12, 2025 13:06
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.

3 participants

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

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts - #17972

Merged
andreiborza merged 9 commits into
developfrom
disable-integrations
Nov 12, 2025
Merged

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts#17972
andreiborza merged 9 commits into
developfrom
disable-integrations

Conversation

@RulaKhaled

@RulaKhaledRulaKhaled commented Oct 20, 2025

Copy link
Copy Markdown
Collaborator

When using higher-level integrations that wrap underlying libraries, both the wrapper integration and the underlying library integration can instrument the same API calls, resulting in duplicate spans. This is particularly problematic for:

  • LangChain wrapping AI providers (OpenAI, Anthropic, Google GenAI)
  • Any future integrations that wrap other instrumented libraries

The disabled integrations mechanism can be used as follows:

// Any integration can disable others to prevent conflictsimport{disableIntegrations,isIntegrationDisabled}from'@sentry/node-core';// In higher-level integration's setupOnce():disableIntegrations('LowerLevelIntegration');// In integration setupOnce() is not called for the disabled integrations 

and is used in LangChain to auto disable OpenAI, Anthropic AI, and Google GenAI integrations in setupOnce().

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser24.6 kB+0.01%+1 B 🔺
@sentry/browser - with treeshaking flags23.09 kB+0.01%+2 B 🔺
@sentry/browser (incl. Tracing)41.23 kB--
@sentry/browser (incl. Tracing, Profiling)45.51 kB--
@sentry/browser (incl. Tracing, Replay)79.7 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags69.38 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay with Canvas)84.39 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay, Feedback)96.56 kB-0.01%-5 B 🔽
@sentry/browser (incl. Feedback)41.27 kB-0.01%-4 B 🔽
@sentry/browser (incl. sendFeedback)29.27 kB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)34.19 kB-0.01%-3 B 🔽
@sentry/react26.28 kB-0.02%-3 B 🔽
@sentry/react (incl. Tracing)43.2 kB+0.01%+2 B 🔺
@sentry/vue29.08 kB+0.01%+1 B 🔺
@sentry/vue (incl. Tracing)43.01 kB+0.01%+1 B 🔺
@sentry/svelte24.61 kB+0.01%+1 B 🔺
CDN Bundle26.9 kB+0.02%+3 B 🔺
CDN Bundle (incl. Tracing)41.78 kB+0.01%+1 B 🔺
CDN Bundle (incl. Tracing, Replay)78.31 kB+0.01%+2 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback)83.78 kB+0.01%+3 B 🔺
CDN Bundle - uncompressed78.86 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing) - uncompressed123.96 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay) - uncompressed239.99 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed252.75 kB-0.01%-4 B 🔽
@sentry/nextjs (client)45.32 kB+0.01%+4 B 🔺
@sentry/sveltekit (client)41.62 kB--
@sentry/node-core50.81 kB+0.1%+47 B 🔺
@sentry/node157.99 kB+0.09%+141 B 🔺
@sentry/node - without tracing92.69 kB+0.05%+46 B 🔺
@sentry/aws-serverless106.45 kB+0.05%+46 B 🔺

View base workflow run

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

node-overhead report 🧳

Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.

ScenarioRequests/s% of BaselinePrev. Requests/sChange %
GET Baseline9,187-8,690+6%
GET With Sentry1,37815%1,397-1%
GET With Sentry (error only)6,14367%6,120+0%
POST Baseline1,206-1,213-1%
POST With Sentry55346%561-1%
POST With Sentry (error only)1,06188%1,072-1%
MYSQL Baseline3,342-3,363-1%
MYSQL With Sentry49415%482+2%
MYSQL With Sentry (error only)2,68080%2,713-1%

View base workflow run

@RulaKhaled
RulaKhaledforce-pushed the disable-integrations branch 2 times, most recently from 470034b to 31cce57CompareOctober 23, 2025 09:14
@RulaKhaled
RulaKhaled marked this pull request as ready for review October 23, 2025 09:16
Comment threadpackages/node/src/integrations/tracing/langchain/index.ts
@cursor

cursorBot commented Oct 23, 2025

Copy link
Copy Markdown

Bug: Race Condition in AI Provider Setup

A race condition exists where the LangChain integration's setupOnce() method disables other AI provider integrations to prevent duplicate spans. However, if an AI provider's setupOnce() runs before LangChain's due to unpredictable integration setup order, it will instrument itself, leading to duplicate spans that this disabling mechanism intends to prevent.

Fix in CursorFix in Web

@RulaKhaled
RulaKhaled marked this pull request as draft October 23, 2025 12:44
@RulaKhaledRulaKhaled changed the title feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictswip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsOct 23, 2025
@RulaKhaledRulaKhaled changed the title wip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsfeat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsNov 4, 2025
@RulaKhaled
RulaKhaled marked this pull request as ready for review November 4, 2025 15:52

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice! I added some comments regarding the current naming of the functions as they kinda imply a different meaning to what they are actually doing and I think it would be good to give this another look when we expose those functions to our users.

And maybe it's also worth to add some tests

Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/node/src/integrations/tracing/langchain/instrumentation.ts Outdated
@RulaKhaled

Copy link
Copy Markdown
CollaboratorAuthor

@s1gr1d Aside from resolving the comments mentioned above, I made a quick refactor to the PR:

Previously, we unregistered all disabled integrations even if their modules weren’t required at runtime (i.e., when the patch wasn’t fired), which broke AI instrumentations. We also couldn’t have handled marking an integration as disabled in the patch while handling disabling in the setup logic, because that would’ve been too late, the integration would’ve already been registered during setup.

To fix this, I moved the registration of disabled integrations into the patch, ensuring it only happens when the module is actually used. Disabled integrations are now unregistered in _patch(), which serves as a good middle ground for now since we don’t want to require customers to disable integrations manually.

Ideally, we’ll support disabling integrations earlier (at setup time), possibly via lazy loading? but that’s TBD and out of scope for this PR.

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like the changes, thanks!

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The approach we landed on seems okay to me, but I think we should be more specific with the naming of it.

Initially, we planned to disable integrations but after a few iterations we landed on skipping wrapping certain ai providers at runtime. I think we can reflect that change in the naming and really just scope this feature to ai providers.

I'd call the methods:

_skipAiProviderWrapping(providers: string[])_shouldSkipAiProviderWrapping(provider: string)_clearAiProviderSkips()

// (e.g., when LangChain skips OpenAI in one client, but a subsequent client uses OpenAI standalone)
_INTERNAL_clearAiProviderSkips();
super._setupIntegrations();
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Reinit Breaks Instrumentation Skip Logic

Calling _INTERNAL_clearAiProviderSkips() in _setupIntegrations() can cause incorrect instrumentation when Sentry.init() is called multiple times. If LangChain was imported during the first initialization and marked AI providers to skip, a second initialization clears those markers. Since LangChain's _patch won't run again (module already loaded), new AI provider client instances created after the second init will be incorrectly instrumented, even though LangChain is active. The skip markers should persist across client reinitializations or only be cleared when LangChain's patch logic runs.

Fix in CursorFix in Web

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.

This is a limitation of the approach taken, should probably be fine in most cases.

@andreiborza
andreiborza merged commit 2406e90 into developNov 12, 2025
195 checks passed
@andreiborza
andreiborza deleted the disable-integrations branch November 12, 2025 13:06
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.

3 participants

@RulaKhaled@s1gr1d@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 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(node-core): Add integration disabling mechanism to prevent instrumentation conflicts - #17972

Merged
andreiborza merged 9 commits into
developfrom
disable-integrations
Nov 12, 2025
Merged

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts#17972
andreiborza merged 9 commits into
developfrom
disable-integrations

Conversation

@RulaKhaled

@RulaKhaledRulaKhaled commented Oct 20, 2025

Copy link
Copy Markdown
Collaborator

When using higher-level integrations that wrap underlying libraries, both the wrapper integration and the underlying library integration can instrument the same API calls, resulting in duplicate spans. This is particularly problematic for:

  • LangChain wrapping AI providers (OpenAI, Anthropic, Google GenAI)
  • Any future integrations that wrap other instrumented libraries

The disabled integrations mechanism can be used as follows:

// Any integration can disable others to prevent conflictsimport{disableIntegrations,isIntegrationDisabled}from'@sentry/node-core';// In higher-level integration's setupOnce():disableIntegrations('LowerLevelIntegration');// In integration setupOnce() is not called for the disabled integrations 

and is used in LangChain to auto disable OpenAI, Anthropic AI, and Google GenAI integrations in setupOnce().

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser24.6 kB+0.01%+1 B 🔺
@sentry/browser - with treeshaking flags23.09 kB+0.01%+2 B 🔺
@sentry/browser (incl. Tracing)41.23 kB--
@sentry/browser (incl. Tracing, Profiling)45.51 kB--
@sentry/browser (incl. Tracing, Replay)79.7 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags69.38 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay with Canvas)84.39 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay, Feedback)96.56 kB-0.01%-5 B 🔽
@sentry/browser (incl. Feedback)41.27 kB-0.01%-4 B 🔽
@sentry/browser (incl. sendFeedback)29.27 kB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)34.19 kB-0.01%-3 B 🔽
@sentry/react26.28 kB-0.02%-3 B 🔽
@sentry/react (incl. Tracing)43.2 kB+0.01%+2 B 🔺
@sentry/vue29.08 kB+0.01%+1 B 🔺
@sentry/vue (incl. Tracing)43.01 kB+0.01%+1 B 🔺
@sentry/svelte24.61 kB+0.01%+1 B 🔺
CDN Bundle26.9 kB+0.02%+3 B 🔺
CDN Bundle (incl. Tracing)41.78 kB+0.01%+1 B 🔺
CDN Bundle (incl. Tracing, Replay)78.31 kB+0.01%+2 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback)83.78 kB+0.01%+3 B 🔺
CDN Bundle - uncompressed78.86 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing) - uncompressed123.96 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay) - uncompressed239.99 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed252.75 kB-0.01%-4 B 🔽
@sentry/nextjs (client)45.32 kB+0.01%+4 B 🔺
@sentry/sveltekit (client)41.62 kB--
@sentry/node-core50.81 kB+0.1%+47 B 🔺
@sentry/node157.99 kB+0.09%+141 B 🔺
@sentry/node - without tracing92.69 kB+0.05%+46 B 🔺
@sentry/aws-serverless106.45 kB+0.05%+46 B 🔺

View base workflow run

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

node-overhead report 🧳

Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.

ScenarioRequests/s% of BaselinePrev. Requests/sChange %
GET Baseline9,187-8,690+6%
GET With Sentry1,37815%1,397-1%
GET With Sentry (error only)6,14367%6,120+0%
POST Baseline1,206-1,213-1%
POST With Sentry55346%561-1%
POST With Sentry (error only)1,06188%1,072-1%
MYSQL Baseline3,342-3,363-1%
MYSQL With Sentry49415%482+2%
MYSQL With Sentry (error only)2,68080%2,713-1%

View base workflow run

@RulaKhaled
RulaKhaledforce-pushed the disable-integrations branch 2 times, most recently from 470034b to 31cce57CompareOctober 23, 2025 09:14
@RulaKhaled
RulaKhaled marked this pull request as ready for review October 23, 2025 09:16
Comment threadpackages/node/src/integrations/tracing/langchain/index.ts
@cursor

cursorBot commented Oct 23, 2025

Copy link
Copy Markdown

Bug: Race Condition in AI Provider Setup

A race condition exists where the LangChain integration's setupOnce() method disables other AI provider integrations to prevent duplicate spans. However, if an AI provider's setupOnce() runs before LangChain's due to unpredictable integration setup order, it will instrument itself, leading to duplicate spans that this disabling mechanism intends to prevent.

Fix in CursorFix in Web

@RulaKhaled
RulaKhaled marked this pull request as draft October 23, 2025 12:44
@RulaKhaledRulaKhaled changed the title feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictswip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsOct 23, 2025
@RulaKhaledRulaKhaled changed the title wip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsfeat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsNov 4, 2025
@RulaKhaled
RulaKhaled marked this pull request as ready for review November 4, 2025 15:52

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice! I added some comments regarding the current naming of the functions as they kinda imply a different meaning to what they are actually doing and I think it would be good to give this another look when we expose those functions to our users.

And maybe it's also worth to add some tests

Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/node/src/integrations/tracing/langchain/instrumentation.ts Outdated
@RulaKhaled

Copy link
Copy Markdown
CollaboratorAuthor

@s1gr1d Aside from resolving the comments mentioned above, I made a quick refactor to the PR:

Previously, we unregistered all disabled integrations even if their modules weren’t required at runtime (i.e., when the patch wasn’t fired), which broke AI instrumentations. We also couldn’t have handled marking an integration as disabled in the patch while handling disabling in the setup logic, because that would’ve been too late, the integration would’ve already been registered during setup.

To fix this, I moved the registration of disabled integrations into the patch, ensuring it only happens when the module is actually used. Disabled integrations are now unregistered in _patch(), which serves as a good middle ground for now since we don’t want to require customers to disable integrations manually.

Ideally, we’ll support disabling integrations earlier (at setup time), possibly via lazy loading? but that’s TBD and out of scope for this PR.

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like the changes, thanks!

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The approach we landed on seems okay to me, but I think we should be more specific with the naming of it.

Initially, we planned to disable integrations but after a few iterations we landed on skipping wrapping certain ai providers at runtime. I think we can reflect that change in the naming and really just scope this feature to ai providers.

I'd call the methods:

_skipAiProviderWrapping(providers: string[])_shouldSkipAiProviderWrapping(provider: string)_clearAiProviderSkips()

// (e.g., when LangChain skips OpenAI in one client, but a subsequent client uses OpenAI standalone)
_INTERNAL_clearAiProviderSkips();
super._setupIntegrations();
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Reinit Breaks Instrumentation Skip Logic

Calling _INTERNAL_clearAiProviderSkips() in _setupIntegrations() can cause incorrect instrumentation when Sentry.init() is called multiple times. If LangChain was imported during the first initialization and marked AI providers to skip, a second initialization clears those markers. Since LangChain's _patch won't run again (module already loaded), new AI provider client instances created after the second init will be incorrectly instrumented, even though LangChain is active. The skip markers should persist across client reinitializations or only be cleared when LangChain's patch logic runs.

Fix in CursorFix in Web

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.

This is a limitation of the approach taken, should probably be fine in most cases.

@andreiborza
andreiborza merged commit 2406e90 into developNov 12, 2025
195 checks passed
@andreiborza
andreiborza deleted the disable-integrations branch November 12, 2025 13:06
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.

3 participants

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

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts - #17972

Merged
andreiborza merged 9 commits into
developfrom
disable-integrations
Nov 12, 2025
Merged

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts#17972
andreiborza merged 9 commits into
developfrom
disable-integrations

Conversation

@RulaKhaled

@RulaKhaledRulaKhaled commented Oct 20, 2025

Copy link
Copy Markdown
Collaborator

When using higher-level integrations that wrap underlying libraries, both the wrapper integration and the underlying library integration can instrument the same API calls, resulting in duplicate spans. This is particularly problematic for:

  • LangChain wrapping AI providers (OpenAI, Anthropic, Google GenAI)
  • Any future integrations that wrap other instrumented libraries

The disabled integrations mechanism can be used as follows:

// Any integration can disable others to prevent conflictsimport{disableIntegrations,isIntegrationDisabled}from'@sentry/node-core';// In higher-level integration's setupOnce():disableIntegrations('LowerLevelIntegration');// In integration setupOnce() is not called for the disabled integrations 

and is used in LangChain to auto disable OpenAI, Anthropic AI, and Google GenAI integrations in setupOnce().

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser24.6 kB+0.01%+1 B 🔺
@sentry/browser - with treeshaking flags23.09 kB+0.01%+2 B 🔺
@sentry/browser (incl. Tracing)41.23 kB--
@sentry/browser (incl. Tracing, Profiling)45.51 kB--
@sentry/browser (incl. Tracing, Replay)79.7 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags69.38 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay with Canvas)84.39 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay, Feedback)96.56 kB-0.01%-5 B 🔽
@sentry/browser (incl. Feedback)41.27 kB-0.01%-4 B 🔽
@sentry/browser (incl. sendFeedback)29.27 kB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)34.19 kB-0.01%-3 B 🔽
@sentry/react26.28 kB-0.02%-3 B 🔽
@sentry/react (incl. Tracing)43.2 kB+0.01%+2 B 🔺
@sentry/vue29.08 kB+0.01%+1 B 🔺
@sentry/vue (incl. Tracing)43.01 kB+0.01%+1 B 🔺
@sentry/svelte24.61 kB+0.01%+1 B 🔺
CDN Bundle26.9 kB+0.02%+3 B 🔺
CDN Bundle (incl. Tracing)41.78 kB+0.01%+1 B 🔺
CDN Bundle (incl. Tracing, Replay)78.31 kB+0.01%+2 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback)83.78 kB+0.01%+3 B 🔺
CDN Bundle - uncompressed78.86 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing) - uncompressed123.96 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay) - uncompressed239.99 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed252.75 kB-0.01%-4 B 🔽
@sentry/nextjs (client)45.32 kB+0.01%+4 B 🔺
@sentry/sveltekit (client)41.62 kB--
@sentry/node-core50.81 kB+0.1%+47 B 🔺
@sentry/node157.99 kB+0.09%+141 B 🔺
@sentry/node - without tracing92.69 kB+0.05%+46 B 🔺
@sentry/aws-serverless106.45 kB+0.05%+46 B 🔺

View base workflow run

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

node-overhead report 🧳

Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.

ScenarioRequests/s% of BaselinePrev. Requests/sChange %
GET Baseline9,187-8,690+6%
GET With Sentry1,37815%1,397-1%
GET With Sentry (error only)6,14367%6,120+0%
POST Baseline1,206-1,213-1%
POST With Sentry55346%561-1%
POST With Sentry (error only)1,06188%1,072-1%
MYSQL Baseline3,342-3,363-1%
MYSQL With Sentry49415%482+2%
MYSQL With Sentry (error only)2,68080%2,713-1%

View base workflow run

@RulaKhaled
RulaKhaledforce-pushed the disable-integrations branch 2 times, most recently from 470034b to 31cce57CompareOctober 23, 2025 09:14
@RulaKhaled
RulaKhaled marked this pull request as ready for review October 23, 2025 09:16
Comment threadpackages/node/src/integrations/tracing/langchain/index.ts
@cursor

cursorBot commented Oct 23, 2025

Copy link
Copy Markdown

Bug: Race Condition in AI Provider Setup

A race condition exists where the LangChain integration's setupOnce() method disables other AI provider integrations to prevent duplicate spans. However, if an AI provider's setupOnce() runs before LangChain's due to unpredictable integration setup order, it will instrument itself, leading to duplicate spans that this disabling mechanism intends to prevent.

Fix in CursorFix in Web

@RulaKhaled
RulaKhaled marked this pull request as draft October 23, 2025 12:44
@RulaKhaledRulaKhaled changed the title feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictswip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsOct 23, 2025
@RulaKhaledRulaKhaled changed the title wip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsfeat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsNov 4, 2025
@RulaKhaled
RulaKhaled marked this pull request as ready for review November 4, 2025 15:52

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice! I added some comments regarding the current naming of the functions as they kinda imply a different meaning to what they are actually doing and I think it would be good to give this another look when we expose those functions to our users.

And maybe it's also worth to add some tests

Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/node/src/integrations/tracing/langchain/instrumentation.ts Outdated
@RulaKhaled

Copy link
Copy Markdown
CollaboratorAuthor

@s1gr1d Aside from resolving the comments mentioned above, I made a quick refactor to the PR:

Previously, we unregistered all disabled integrations even if their modules weren’t required at runtime (i.e., when the patch wasn’t fired), which broke AI instrumentations. We also couldn’t have handled marking an integration as disabled in the patch while handling disabling in the setup logic, because that would’ve been too late, the integration would’ve already been registered during setup.

To fix this, I moved the registration of disabled integrations into the patch, ensuring it only happens when the module is actually used. Disabled integrations are now unregistered in _patch(), which serves as a good middle ground for now since we don’t want to require customers to disable integrations manually.

Ideally, we’ll support disabling integrations earlier (at setup time), possibly via lazy loading? but that’s TBD and out of scope for this PR.

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like the changes, thanks!

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The approach we landed on seems okay to me, but I think we should be more specific with the naming of it.

Initially, we planned to disable integrations but after a few iterations we landed on skipping wrapping certain ai providers at runtime. I think we can reflect that change in the naming and really just scope this feature to ai providers.

I'd call the methods:

_skipAiProviderWrapping(providers: string[])_shouldSkipAiProviderWrapping(provider: string)_clearAiProviderSkips()

// (e.g., when LangChain skips OpenAI in one client, but a subsequent client uses OpenAI standalone)
_INTERNAL_clearAiProviderSkips();
super._setupIntegrations();
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Reinit Breaks Instrumentation Skip Logic

Calling _INTERNAL_clearAiProviderSkips() in _setupIntegrations() can cause incorrect instrumentation when Sentry.init() is called multiple times. If LangChain was imported during the first initialization and marked AI providers to skip, a second initialization clears those markers. Since LangChain's _patch won't run again (module already loaded), new AI provider client instances created after the second init will be incorrectly instrumented, even though LangChain is active. The skip markers should persist across client reinitializations or only be cleared when LangChain's patch logic runs.

Fix in CursorFix in Web

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.

This is a limitation of the approach taken, should probably be fine in most cases.

@andreiborza
andreiborza merged commit 2406e90 into developNov 12, 2025
195 checks passed
@andreiborza
andreiborza deleted the disable-integrations branch November 12, 2025 13:06
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.

3 participants

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

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts - #17972

Merged
andreiborza merged 9 commits into
developfrom
disable-integrations
Nov 12, 2025
Merged

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts#17972
andreiborza merged 9 commits into
developfrom
disable-integrations

Conversation

@RulaKhaled

@RulaKhaledRulaKhaled commented Oct 20, 2025

Copy link
Copy Markdown
Collaborator

When using higher-level integrations that wrap underlying libraries, both the wrapper integration and the underlying library integration can instrument the same API calls, resulting in duplicate spans. This is particularly problematic for:

  • LangChain wrapping AI providers (OpenAI, Anthropic, Google GenAI)
  • Any future integrations that wrap other instrumented libraries

The disabled integrations mechanism can be used as follows:

// Any integration can disable others to prevent conflictsimport{disableIntegrations,isIntegrationDisabled}from'@sentry/node-core';// In higher-level integration's setupOnce():disableIntegrations('LowerLevelIntegration');// In integration setupOnce() is not called for the disabled integrations 

and is used in LangChain to auto disable OpenAI, Anthropic AI, and Google GenAI integrations in setupOnce().

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser24.6 kB+0.01%+1 B 🔺
@sentry/browser - with treeshaking flags23.09 kB+0.01%+2 B 🔺
@sentry/browser (incl. Tracing)41.23 kB--
@sentry/browser (incl. Tracing, Profiling)45.51 kB--
@sentry/browser (incl. Tracing, Replay)79.7 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags69.38 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay with Canvas)84.39 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay, Feedback)96.56 kB-0.01%-5 B 🔽
@sentry/browser (incl. Feedback)41.27 kB-0.01%-4 B 🔽
@sentry/browser (incl. sendFeedback)29.27 kB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)34.19 kB-0.01%-3 B 🔽
@sentry/react26.28 kB-0.02%-3 B 🔽
@sentry/react (incl. Tracing)43.2 kB+0.01%+2 B 🔺
@sentry/vue29.08 kB+0.01%+1 B 🔺
@sentry/vue (incl. Tracing)43.01 kB+0.01%+1 B 🔺
@sentry/svelte24.61 kB+0.01%+1 B 🔺
CDN Bundle26.9 kB+0.02%+3 B 🔺
CDN Bundle (incl. Tracing)41.78 kB+0.01%+1 B 🔺
CDN Bundle (incl. Tracing, Replay)78.31 kB+0.01%+2 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback)83.78 kB+0.01%+3 B 🔺
CDN Bundle - uncompressed78.86 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing) - uncompressed123.96 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay) - uncompressed239.99 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed252.75 kB-0.01%-4 B 🔽
@sentry/nextjs (client)45.32 kB+0.01%+4 B 🔺
@sentry/sveltekit (client)41.62 kB--
@sentry/node-core50.81 kB+0.1%+47 B 🔺
@sentry/node157.99 kB+0.09%+141 B 🔺
@sentry/node - without tracing92.69 kB+0.05%+46 B 🔺
@sentry/aws-serverless106.45 kB+0.05%+46 B 🔺

View base workflow run

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

node-overhead report 🧳

Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.

ScenarioRequests/s% of BaselinePrev. Requests/sChange %
GET Baseline9,187-8,690+6%
GET With Sentry1,37815%1,397-1%
GET With Sentry (error only)6,14367%6,120+0%
POST Baseline1,206-1,213-1%
POST With Sentry55346%561-1%
POST With Sentry (error only)1,06188%1,072-1%
MYSQL Baseline3,342-3,363-1%
MYSQL With Sentry49415%482+2%
MYSQL With Sentry (error only)2,68080%2,713-1%

View base workflow run

@RulaKhaled
RulaKhaledforce-pushed the disable-integrations branch 2 times, most recently from 470034b to 31cce57CompareOctober 23, 2025 09:14
@RulaKhaled
RulaKhaled marked this pull request as ready for review October 23, 2025 09:16
Comment threadpackages/node/src/integrations/tracing/langchain/index.ts
@cursor

cursorBot commented Oct 23, 2025

Copy link
Copy Markdown

Bug: Race Condition in AI Provider Setup

A race condition exists where the LangChain integration's setupOnce() method disables other AI provider integrations to prevent duplicate spans. However, if an AI provider's setupOnce() runs before LangChain's due to unpredictable integration setup order, it will instrument itself, leading to duplicate spans that this disabling mechanism intends to prevent.

Fix in CursorFix in Web

@RulaKhaled
RulaKhaled marked this pull request as draft October 23, 2025 12:44
@RulaKhaledRulaKhaled changed the title feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictswip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsOct 23, 2025
@RulaKhaledRulaKhaled changed the title wip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsfeat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsNov 4, 2025
@RulaKhaled
RulaKhaled marked this pull request as ready for review November 4, 2025 15:52

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice! I added some comments regarding the current naming of the functions as they kinda imply a different meaning to what they are actually doing and I think it would be good to give this another look when we expose those functions to our users.

And maybe it's also worth to add some tests

Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/node/src/integrations/tracing/langchain/instrumentation.ts Outdated
@RulaKhaled

Copy link
Copy Markdown
CollaboratorAuthor

@s1gr1d Aside from resolving the comments mentioned above, I made a quick refactor to the PR:

Previously, we unregistered all disabled integrations even if their modules weren’t required at runtime (i.e., when the patch wasn’t fired), which broke AI instrumentations. We also couldn’t have handled marking an integration as disabled in the patch while handling disabling in the setup logic, because that would’ve been too late, the integration would’ve already been registered during setup.

To fix this, I moved the registration of disabled integrations into the patch, ensuring it only happens when the module is actually used. Disabled integrations are now unregistered in _patch(), which serves as a good middle ground for now since we don’t want to require customers to disable integrations manually.

Ideally, we’ll support disabling integrations earlier (at setup time), possibly via lazy loading? but that’s TBD and out of scope for this PR.

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like the changes, thanks!

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The approach we landed on seems okay to me, but I think we should be more specific with the naming of it.

Initially, we planned to disable integrations but after a few iterations we landed on skipping wrapping certain ai providers at runtime. I think we can reflect that change in the naming and really just scope this feature to ai providers.

I'd call the methods:

_skipAiProviderWrapping(providers: string[])_shouldSkipAiProviderWrapping(provider: string)_clearAiProviderSkips()

// (e.g., when LangChain skips OpenAI in one client, but a subsequent client uses OpenAI standalone)
_INTERNAL_clearAiProviderSkips();
super._setupIntegrations();
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Reinit Breaks Instrumentation Skip Logic

Calling _INTERNAL_clearAiProviderSkips() in _setupIntegrations() can cause incorrect instrumentation when Sentry.init() is called multiple times. If LangChain was imported during the first initialization and marked AI providers to skip, a second initialization clears those markers. Since LangChain's _patch won't run again (module already loaded), new AI provider client instances created after the second init will be incorrectly instrumented, even though LangChain is active. The skip markers should persist across client reinitializations or only be cleared when LangChain's patch logic runs.

Fix in CursorFix in Web

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.

This is a limitation of the approach taken, should probably be fine in most cases.

@andreiborza
andreiborza merged commit 2406e90 into developNov 12, 2025
195 checks passed
@andreiborza
andreiborza deleted the disable-integrations branch November 12, 2025 13:06
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.

3 participants

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

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts - #17972

Merged
andreiborza merged 9 commits into
developfrom
disable-integrations
Nov 12, 2025
Merged

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts#17972
andreiborza merged 9 commits into
developfrom
disable-integrations

Conversation

@RulaKhaled

@RulaKhaledRulaKhaled commented Oct 20, 2025

Copy link
Copy Markdown
Collaborator

When using higher-level integrations that wrap underlying libraries, both the wrapper integration and the underlying library integration can instrument the same API calls, resulting in duplicate spans. This is particularly problematic for:

  • LangChain wrapping AI providers (OpenAI, Anthropic, Google GenAI)
  • Any future integrations that wrap other instrumented libraries

The disabled integrations mechanism can be used as follows:

// Any integration can disable others to prevent conflictsimport{disableIntegrations,isIntegrationDisabled}from'@sentry/node-core';// In higher-level integration's setupOnce():disableIntegrations('LowerLevelIntegration');// In integration setupOnce() is not called for the disabled integrations 

and is used in LangChain to auto disable OpenAI, Anthropic AI, and Google GenAI integrations in setupOnce().

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser24.6 kB+0.01%+1 B 🔺
@sentry/browser - with treeshaking flags23.09 kB+0.01%+2 B 🔺
@sentry/browser (incl. Tracing)41.23 kB--
@sentry/browser (incl. Tracing, Profiling)45.51 kB--
@sentry/browser (incl. Tracing, Replay)79.7 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags69.38 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay with Canvas)84.39 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay, Feedback)96.56 kB-0.01%-5 B 🔽
@sentry/browser (incl. Feedback)41.27 kB-0.01%-4 B 🔽
@sentry/browser (incl. sendFeedback)29.27 kB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)34.19 kB-0.01%-3 B 🔽
@sentry/react26.28 kB-0.02%-3 B 🔽
@sentry/react (incl. Tracing)43.2 kB+0.01%+2 B 🔺
@sentry/vue29.08 kB+0.01%+1 B 🔺
@sentry/vue (incl. Tracing)43.01 kB+0.01%+1 B 🔺
@sentry/svelte24.61 kB+0.01%+1 B 🔺
CDN Bundle26.9 kB+0.02%+3 B 🔺
CDN Bundle (incl. Tracing)41.78 kB+0.01%+1 B 🔺
CDN Bundle (incl. Tracing, Replay)78.31 kB+0.01%+2 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback)83.78 kB+0.01%+3 B 🔺
CDN Bundle - uncompressed78.86 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing) - uncompressed123.96 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay) - uncompressed239.99 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed252.75 kB-0.01%-4 B 🔽
@sentry/nextjs (client)45.32 kB+0.01%+4 B 🔺
@sentry/sveltekit (client)41.62 kB--
@sentry/node-core50.81 kB+0.1%+47 B 🔺
@sentry/node157.99 kB+0.09%+141 B 🔺
@sentry/node - without tracing92.69 kB+0.05%+46 B 🔺
@sentry/aws-serverless106.45 kB+0.05%+46 B 🔺

View base workflow run

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

node-overhead report 🧳

Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.

ScenarioRequests/s% of BaselinePrev. Requests/sChange %
GET Baseline9,187-8,690+6%
GET With Sentry1,37815%1,397-1%
GET With Sentry (error only)6,14367%6,120+0%
POST Baseline1,206-1,213-1%
POST With Sentry55346%561-1%
POST With Sentry (error only)1,06188%1,072-1%
MYSQL Baseline3,342-3,363-1%
MYSQL With Sentry49415%482+2%
MYSQL With Sentry (error only)2,68080%2,713-1%

View base workflow run

@RulaKhaled
RulaKhaledforce-pushed the disable-integrations branch 2 times, most recently from 470034b to 31cce57CompareOctober 23, 2025 09:14
@RulaKhaled
RulaKhaled marked this pull request as ready for review October 23, 2025 09:16
Comment threadpackages/node/src/integrations/tracing/langchain/index.ts
@cursor

cursorBot commented Oct 23, 2025

Copy link
Copy Markdown

Bug: Race Condition in AI Provider Setup

A race condition exists where the LangChain integration's setupOnce() method disables other AI provider integrations to prevent duplicate spans. However, if an AI provider's setupOnce() runs before LangChain's due to unpredictable integration setup order, it will instrument itself, leading to duplicate spans that this disabling mechanism intends to prevent.

Fix in CursorFix in Web

@RulaKhaled
RulaKhaled marked this pull request as draft October 23, 2025 12:44
@RulaKhaledRulaKhaled changed the title feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictswip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsOct 23, 2025
@RulaKhaledRulaKhaled changed the title wip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsfeat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsNov 4, 2025
@RulaKhaled
RulaKhaled marked this pull request as ready for review November 4, 2025 15:52

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice! I added some comments regarding the current naming of the functions as they kinda imply a different meaning to what they are actually doing and I think it would be good to give this another look when we expose those functions to our users.

And maybe it's also worth to add some tests

Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/node/src/integrations/tracing/langchain/instrumentation.ts Outdated
@RulaKhaled

Copy link
Copy Markdown
CollaboratorAuthor

@s1gr1d Aside from resolving the comments mentioned above, I made a quick refactor to the PR:

Previously, we unregistered all disabled integrations even if their modules weren’t required at runtime (i.e., when the patch wasn’t fired), which broke AI instrumentations. We also couldn’t have handled marking an integration as disabled in the patch while handling disabling in the setup logic, because that would’ve been too late, the integration would’ve already been registered during setup.

To fix this, I moved the registration of disabled integrations into the patch, ensuring it only happens when the module is actually used. Disabled integrations are now unregistered in _patch(), which serves as a good middle ground for now since we don’t want to require customers to disable integrations manually.

Ideally, we’ll support disabling integrations earlier (at setup time), possibly via lazy loading? but that’s TBD and out of scope for this PR.

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like the changes, thanks!

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The approach we landed on seems okay to me, but I think we should be more specific with the naming of it.

Initially, we planned to disable integrations but after a few iterations we landed on skipping wrapping certain ai providers at runtime. I think we can reflect that change in the naming and really just scope this feature to ai providers.

I'd call the methods:

_skipAiProviderWrapping(providers: string[])_shouldSkipAiProviderWrapping(provider: string)_clearAiProviderSkips()

// (e.g., when LangChain skips OpenAI in one client, but a subsequent client uses OpenAI standalone)
_INTERNAL_clearAiProviderSkips();
super._setupIntegrations();
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Reinit Breaks Instrumentation Skip Logic

Calling _INTERNAL_clearAiProviderSkips() in _setupIntegrations() can cause incorrect instrumentation when Sentry.init() is called multiple times. If LangChain was imported during the first initialization and marked AI providers to skip, a second initialization clears those markers. Since LangChain's _patch won't run again (module already loaded), new AI provider client instances created after the second init will be incorrectly instrumented, even though LangChain is active. The skip markers should persist across client reinitializations or only be cleared when LangChain's patch logic runs.

Fix in CursorFix in Web

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.

This is a limitation of the approach taken, should probably be fine in most cases.

@andreiborza
andreiborza merged commit 2406e90 into developNov 12, 2025
195 checks passed
@andreiborza
andreiborza deleted the disable-integrations branch November 12, 2025 13:06
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.

3 participants

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

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts - #17972

Merged
andreiborza merged 9 commits into
developfrom
disable-integrations
Nov 12, 2025
Merged

feat(node-core): Add integration disabling mechanism to prevent instrumentation conflicts#17972
andreiborza merged 9 commits into
developfrom
disable-integrations

Conversation

@RulaKhaled

@RulaKhaledRulaKhaled commented Oct 20, 2025

Copy link
Copy Markdown
Collaborator

When using higher-level integrations that wrap underlying libraries, both the wrapper integration and the underlying library integration can instrument the same API calls, resulting in duplicate spans. This is particularly problematic for:

  • LangChain wrapping AI providers (OpenAI, Anthropic, Google GenAI)
  • Any future integrations that wrap other instrumented libraries

The disabled integrations mechanism can be used as follows:

// Any integration can disable others to prevent conflictsimport{disableIntegrations,isIntegrationDisabled}from'@sentry/node-core';// In higher-level integration's setupOnce():disableIntegrations('LowerLevelIntegration');// In integration setupOnce() is not called for the disabled integrations 

and is used in LangChain to auto disable OpenAI, Anthropic AI, and Google GenAI integrations in setupOnce().

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize% ChangeChange
@sentry/browser24.6 kB+0.01%+1 B 🔺
@sentry/browser - with treeshaking flags23.09 kB+0.01%+2 B 🔺
@sentry/browser (incl. Tracing)41.23 kB--
@sentry/browser (incl. Tracing, Profiling)45.51 kB--
@sentry/browser (incl. Tracing, Replay)79.7 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags69.38 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay with Canvas)84.39 kB+0.01%+1 B 🔺
@sentry/browser (incl. Tracing, Replay, Feedback)96.56 kB-0.01%-5 B 🔽
@sentry/browser (incl. Feedback)41.27 kB-0.01%-4 B 🔽
@sentry/browser (incl. sendFeedback)29.27 kB+0.01%+1 B 🔺
@sentry/browser (incl. FeedbackAsync)34.19 kB-0.01%-3 B 🔽
@sentry/react26.28 kB-0.02%-3 B 🔽
@sentry/react (incl. Tracing)43.2 kB+0.01%+2 B 🔺
@sentry/vue29.08 kB+0.01%+1 B 🔺
@sentry/vue (incl. Tracing)43.01 kB+0.01%+1 B 🔺
@sentry/svelte24.61 kB+0.01%+1 B 🔺
CDN Bundle26.9 kB+0.02%+3 B 🔺
CDN Bundle (incl. Tracing)41.78 kB+0.01%+1 B 🔺
CDN Bundle (incl. Tracing, Replay)78.31 kB+0.01%+2 B 🔺
CDN Bundle (incl. Tracing, Replay, Feedback)83.78 kB+0.01%+3 B 🔺
CDN Bundle - uncompressed78.86 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing) - uncompressed123.96 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay) - uncompressed239.99 kB-0.01%-4 B 🔽
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed252.75 kB-0.01%-4 B 🔽
@sentry/nextjs (client)45.32 kB+0.01%+4 B 🔺
@sentry/sveltekit (client)41.62 kB--
@sentry/node-core50.81 kB+0.1%+47 B 🔺
@sentry/node157.99 kB+0.09%+141 B 🔺
@sentry/node - without tracing92.69 kB+0.05%+46 B 🔺
@sentry/aws-serverless106.45 kB+0.05%+46 B 🔺

View base workflow run

@github-actions

github-actionsBot commented Oct 20, 2025

Copy link
Copy Markdown
Contributor

node-overhead report 🧳

Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.

ScenarioRequests/s% of BaselinePrev. Requests/sChange %
GET Baseline9,187-8,690+6%
GET With Sentry1,37815%1,397-1%
GET With Sentry (error only)6,14367%6,120+0%
POST Baseline1,206-1,213-1%
POST With Sentry55346%561-1%
POST With Sentry (error only)1,06188%1,072-1%
MYSQL Baseline3,342-3,363-1%
MYSQL With Sentry49415%482+2%
MYSQL With Sentry (error only)2,68080%2,713-1%

View base workflow run

@RulaKhaled
RulaKhaledforce-pushed the disable-integrations branch 2 times, most recently from 470034b to 31cce57CompareOctober 23, 2025 09:14
@RulaKhaled
RulaKhaled marked this pull request as ready for review October 23, 2025 09:16
Comment threadpackages/node/src/integrations/tracing/langchain/index.ts
@cursor

cursorBot commented Oct 23, 2025

Copy link
Copy Markdown

Bug: Race Condition in AI Provider Setup

A race condition exists where the LangChain integration's setupOnce() method disables other AI provider integrations to prevent duplicate spans. However, if an AI provider's setupOnce() runs before LangChain's due to unpredictable integration setup order, it will instrument itself, leading to duplicate spans that this disabling mechanism intends to prevent.

Fix in CursorFix in Web

@RulaKhaled
RulaKhaled marked this pull request as draft October 23, 2025 12:44
@RulaKhaledRulaKhaled changed the title feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictswip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsOct 23, 2025
@RulaKhaledRulaKhaled changed the title wip feat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsfeat(node-core): Add integration disabling mechanism to prevent instrumentation conflictsNov 4, 2025
@RulaKhaled
RulaKhaled marked this pull request as ready for review November 4, 2025 15:52

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice! I added some comments regarding the current naming of the functions as they kinda imply a different meaning to what they are actually doing and I think it would be good to give this another look when we expose those functions to our users.

And maybe it's also worth to add some tests

Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/core/src/integration.ts Outdated
Comment threadpackages/node/src/integrations/tracing/langchain/instrumentation.ts Outdated
@RulaKhaled

Copy link
Copy Markdown
CollaboratorAuthor

@s1gr1d Aside from resolving the comments mentioned above, I made a quick refactor to the PR:

Previously, we unregistered all disabled integrations even if their modules weren’t required at runtime (i.e., when the patch wasn’t fired), which broke AI instrumentations. We also couldn’t have handled marking an integration as disabled in the patch while handling disabling in the setup logic, because that would’ve been too late, the integration would’ve already been registered during setup.

To fix this, I moved the registration of disabled integrations into the patch, ensuring it only happens when the module is actually used. Disabled integrations are now unregistered in _patch(), which serves as a good middle ground for now since we don’t want to require customers to disable integrations manually.

Ideally, we’ll support disabling integrations earlier (at setup time), possibly via lazy loading? but that’s TBD and out of scope for this PR.

@s1gr1ds1gr1d left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like the changes, thanks!

@andreiborzaandreiborza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The approach we landed on seems okay to me, but I think we should be more specific with the naming of it.

Initially, we planned to disable integrations but after a few iterations we landed on skipping wrapping certain ai providers at runtime. I think we can reflect that change in the naming and really just scope this feature to ai providers.

I'd call the methods:

_skipAiProviderWrapping(providers: string[])_shouldSkipAiProviderWrapping(provider: string)_clearAiProviderSkips()

// (e.g., when LangChain skips OpenAI in one client, but a subsequent client uses OpenAI standalone)
_INTERNAL_clearAiProviderSkips();
super._setupIntegrations();
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bug: Reinit Breaks Instrumentation Skip Logic

Calling _INTERNAL_clearAiProviderSkips() in _setupIntegrations() can cause incorrect instrumentation when Sentry.init() is called multiple times. If LangChain was imported during the first initialization and marked AI providers to skip, a second initialization clears those markers. Since LangChain's _patch won't run again (module already loaded), new AI provider client instances created after the second init will be incorrectly instrumented, even though LangChain is active. The skip markers should persist across client reinitializations or only be cleared when LangChain's patch logic runs.

Fix in CursorFix in Web

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.

This is a limitation of the approach taken, should probably be fine in most cases.

@andreiborza
andreiborza merged commit 2406e90 into developNov 12, 2025
195 checks passed
@andreiborza
andreiborza deleted the disable-integrations branch November 12, 2025 13:06
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.

3 participants

@RulaKhaled@s1gr1d@andreiborza