ref(node): Streamline dataloader instrumentation - #21475

Merged
mydea merged 5 commits into
developfrom
fn/streamline-dataloader
Jun 15, 2026
Merged

ref(node): Streamline dataloader instrumentation#21475
mydea merged 5 commits into
developfrom
fn/streamline-dataloader

Conversation

@mydea

@mydeamydea commented Jun 11, 2026

Copy link
Copy Markdown
Member

This streamlines the vendored dataloader instrumentation:

  • Use Sentry.startSpan instead of tracer APIs
    • this allows us to streamline a bunch of things, e.g. using the built-in onlyIfParent option
  • Remove instrumentation options we hardcode anyhow (we always use onlyIfParent)
  • Streamline types to what we actually need
  • Fix linting errors (remove eslint-disable comment)
  • Add tests covering all methods, actually
  • Moved custom span attributes etc. we had to hackily set in on('spanStart') directly into the instrumentation

This is overall much simpler, as we use the built-in error handling etc. from Sentry.startSpan.

Closes#20725

@mydeamydea self-assigned this Jun 11, 2026
@mydea
mydea requested a review from a team as a code ownerJune 11, 2026 15:18
@mydea
mydea requested review from JPeer264 and removed request for a teamJune 11, 2026 15:18
@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from f1ab607 to 070c3c0CompareJune 12, 2026 07:33

@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.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

await runner.makeRequest('get', '/load');
await runner.makeRequest('get', '/load-many');
await runner.makeRequest('get', '/cache-ops');
await runner.makeRequest('get', '/named');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Chained expects assume envelope order

Medium Severity

The test chains four .expect({ transaction: … }) callbacks, but the integration runner matches incoming envelopes with expectedEnvelopes.shift(), so the first callback always runs on the first transaction received—not necessarily GET /load. Four back-to-back HTTP requests can emit transactions in a different order than the expects, causing flaky failures when the wrong callback validates the wrong route.

Fix in CursorFix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

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 should not be possible to flush in a different order

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 946b207 to 837e1dbCompareJune 12, 2026 08:55

@JPeer264JPeer264 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.

so much cleaner now

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 837e1db to f613978CompareJune 15, 2026 08:32
@mydea
mydea merged commit 1bf2bad into developJun 15, 2026
532 of 536 checks passed
@mydea
mydea deleted the fn/streamline-dataloader branch June 15, 2026 09:16
mydea added a commit that referenced this pull request Jun 16, 2026
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
* Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead of
the OTel tracer APIs
* Use the built-in `onlyIfParent` option instead of `requireParentSpan` +
a hand-rolled parent check
* Remove the unused `createHook`/`endHook`/`requireParentSpan` config and
inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
* Streamline the types to what we actually need
* Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
* Add tests covering the previously-untested option gating
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes were gated on `recordErrorMessagesAsSpanAttributes` instead.
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the docs.
Closes#20726
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
mydea added a commit that referenced this pull request Jun 16, 2026
## Summary
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
- Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead
of the OTel tracer APIs
- Use the built-in `onlyIfParent` option instead of `requireParentSpan`
+ a hand-rolled parent check
- Remove the unused `createHook`/`endHook`/`requireParentSpan` config
and inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
- Streamline the types to what we actually need
- Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
- Add tests covering the previously-untested option gating
`context.bind` from `@opentelemetry/api` is kept only for the
callback-style functions, where the user's async callback must be
restored to the parent context (so it isn't parented to the fs span or
caught by tracing suppression) — there is no Sentry equivalent for this.
## Root cause (drive-by bug fix)
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes (`path_argument`, `src_argument`, etc.) were gated on
`recordErrorMessagesAsSpanAttributes` instead (dates back to the
original integration in #13291).
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the documented options.
New integration tests cover each gate in isolation.
Closes#20726
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.

Streamline @opentelemetry/instrumentation-dataloader

2 participants

@mydea@JPeer264
, '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

ref(node): Streamline dataloader instrumentation - #21475

Merged
mydea merged 5 commits into
developfrom
fn/streamline-dataloader
Jun 15, 2026
Merged

ref(node): Streamline dataloader instrumentation#21475
mydea merged 5 commits into
developfrom
fn/streamline-dataloader

Conversation

@mydea

@mydeamydea commented Jun 11, 2026

Copy link
Copy Markdown
Member

This streamlines the vendored dataloader instrumentation:

  • Use Sentry.startSpan instead of tracer APIs
    • this allows us to streamline a bunch of things, e.g. using the built-in onlyIfParent option
  • Remove instrumentation options we hardcode anyhow (we always use onlyIfParent)
  • Streamline types to what we actually need
  • Fix linting errors (remove eslint-disable comment)
  • Add tests covering all methods, actually
  • Moved custom span attributes etc. we had to hackily set in on('spanStart') directly into the instrumentation

This is overall much simpler, as we use the built-in error handling etc. from Sentry.startSpan.

Closes#20725

@mydeamydea self-assigned this Jun 11, 2026
@mydea
mydea requested a review from a team as a code ownerJune 11, 2026 15:18
@mydea
mydea requested review from JPeer264 and removed request for a teamJune 11, 2026 15:18
@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from f1ab607 to 070c3c0CompareJune 12, 2026 07:33

@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.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

await runner.makeRequest('get', '/load');
await runner.makeRequest('get', '/load-many');
await runner.makeRequest('get', '/cache-ops');
await runner.makeRequest('get', '/named');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Chained expects assume envelope order

Medium Severity

The test chains four .expect({ transaction: … }) callbacks, but the integration runner matches incoming envelopes with expectedEnvelopes.shift(), so the first callback always runs on the first transaction received—not necessarily GET /load. Four back-to-back HTTP requests can emit transactions in a different order than the expects, causing flaky failures when the wrong callback validates the wrong route.

Fix in CursorFix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

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 should not be possible to flush in a different order

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 946b207 to 837e1dbCompareJune 12, 2026 08:55

@JPeer264JPeer264 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.

so much cleaner now

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 837e1db to f613978CompareJune 15, 2026 08:32
@mydea
mydea merged commit 1bf2bad into developJun 15, 2026
532 of 536 checks passed
@mydea
mydea deleted the fn/streamline-dataloader branch June 15, 2026 09:16
mydea added a commit that referenced this pull request Jun 16, 2026
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
* Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead of
the OTel tracer APIs
* Use the built-in `onlyIfParent` option instead of `requireParentSpan` +
a hand-rolled parent check
* Remove the unused `createHook`/`endHook`/`requireParentSpan` config and
inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
* Streamline the types to what we actually need
* Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
* Add tests covering the previously-untested option gating
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes were gated on `recordErrorMessagesAsSpanAttributes` instead.
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the docs.
Closes#20726
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
mydea added a commit that referenced this pull request Jun 16, 2026
## Summary
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
- Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead
of the OTel tracer APIs
- Use the built-in `onlyIfParent` option instead of `requireParentSpan`
+ a hand-rolled parent check
- Remove the unused `createHook`/`endHook`/`requireParentSpan` config
and inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
- Streamline the types to what we actually need
- Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
- Add tests covering the previously-untested option gating
`context.bind` from `@opentelemetry/api` is kept only for the
callback-style functions, where the user's async callback must be
restored to the parent context (so it isn't parented to the fs span or
caught by tracing suppression) — there is no Sentry equivalent for this.
## Root cause (drive-by bug fix)
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes (`path_argument`, `src_argument`, etc.) were gated on
`recordErrorMessagesAsSpanAttributes` instead (dates back to the
original integration in #13291).
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the documented options.
New integration tests cover each gate in isolation.
Closes#20726
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.

Streamline @opentelemetry/instrumentation-dataloader

2 participants

@mydea@JPeer264
, '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

ref(node): Streamline dataloader instrumentation - #21475

Merged
mydea merged 5 commits into
developfrom
fn/streamline-dataloader
Jun 15, 2026
Merged

ref(node): Streamline dataloader instrumentation#21475
mydea merged 5 commits into
developfrom
fn/streamline-dataloader

Conversation

@mydea

@mydeamydea commented Jun 11, 2026

Copy link
Copy Markdown
Member

This streamlines the vendored dataloader instrumentation:

  • Use Sentry.startSpan instead of tracer APIs
    • this allows us to streamline a bunch of things, e.g. using the built-in onlyIfParent option
  • Remove instrumentation options we hardcode anyhow (we always use onlyIfParent)
  • Streamline types to what we actually need
  • Fix linting errors (remove eslint-disable comment)
  • Add tests covering all methods, actually
  • Moved custom span attributes etc. we had to hackily set in on('spanStart') directly into the instrumentation

This is overall much simpler, as we use the built-in error handling etc. from Sentry.startSpan.

Closes#20725

@mydeamydea self-assigned this Jun 11, 2026
@mydea
mydea requested a review from a team as a code ownerJune 11, 2026 15:18
@mydea
mydea requested review from JPeer264 and removed request for a teamJune 11, 2026 15:18
@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from f1ab607 to 070c3c0CompareJune 12, 2026 07:33

@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.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

await runner.makeRequest('get', '/load');
await runner.makeRequest('get', '/load-many');
await runner.makeRequest('get', '/cache-ops');
await runner.makeRequest('get', '/named');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Chained expects assume envelope order

Medium Severity

The test chains four .expect({ transaction: … }) callbacks, but the integration runner matches incoming envelopes with expectedEnvelopes.shift(), so the first callback always runs on the first transaction received—not necessarily GET /load. Four back-to-back HTTP requests can emit transactions in a different order than the expects, causing flaky failures when the wrong callback validates the wrong route.

Fix in CursorFix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

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 should not be possible to flush in a different order

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 946b207 to 837e1dbCompareJune 12, 2026 08:55

@JPeer264JPeer264 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.

so much cleaner now

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 837e1db to f613978CompareJune 15, 2026 08:32
@mydea
mydea merged commit 1bf2bad into developJun 15, 2026
532 of 536 checks passed
@mydea
mydea deleted the fn/streamline-dataloader branch June 15, 2026 09:16
mydea added a commit that referenced this pull request Jun 16, 2026
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
* Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead of
the OTel tracer APIs
* Use the built-in `onlyIfParent` option instead of `requireParentSpan` +
a hand-rolled parent check
* Remove the unused `createHook`/`endHook`/`requireParentSpan` config and
inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
* Streamline the types to what we actually need
* Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
* Add tests covering the previously-untested option gating
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes were gated on `recordErrorMessagesAsSpanAttributes` instead.
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the docs.
Closes#20726
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
mydea added a commit that referenced this pull request Jun 16, 2026
## Summary
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
- Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead
of the OTel tracer APIs
- Use the built-in `onlyIfParent` option instead of `requireParentSpan`
+ a hand-rolled parent check
- Remove the unused `createHook`/`endHook`/`requireParentSpan` config
and inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
- Streamline the types to what we actually need
- Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
- Add tests covering the previously-untested option gating
`context.bind` from `@opentelemetry/api` is kept only for the
callback-style functions, where the user's async callback must be
restored to the parent context (so it isn't parented to the fs span or
caught by tracing suppression) — there is no Sentry equivalent for this.
## Root cause (drive-by bug fix)
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes (`path_argument`, `src_argument`, etc.) were gated on
`recordErrorMessagesAsSpanAttributes` instead (dates back to the
original integration in #13291).
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the documented options.
New integration tests cover each gate in isolation.
Closes#20726
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.

Streamline @opentelemetry/instrumentation-dataloader

2 participants

@mydea@JPeer264
, '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

ref(node): Streamline dataloader instrumentation - #21475

Merged
mydea merged 5 commits into
developfrom
fn/streamline-dataloader
Jun 15, 2026
Merged

ref(node): Streamline dataloader instrumentation#21475
mydea merged 5 commits into
developfrom
fn/streamline-dataloader

Conversation

@mydea

@mydeamydea commented Jun 11, 2026

Copy link
Copy Markdown
Member

This streamlines the vendored dataloader instrumentation:

  • Use Sentry.startSpan instead of tracer APIs
    • this allows us to streamline a bunch of things, e.g. using the built-in onlyIfParent option
  • Remove instrumentation options we hardcode anyhow (we always use onlyIfParent)
  • Streamline types to what we actually need
  • Fix linting errors (remove eslint-disable comment)
  • Add tests covering all methods, actually
  • Moved custom span attributes etc. we had to hackily set in on('spanStart') directly into the instrumentation

This is overall much simpler, as we use the built-in error handling etc. from Sentry.startSpan.

Closes#20725

@mydeamydea self-assigned this Jun 11, 2026
@mydea
mydea requested a review from a team as a code ownerJune 11, 2026 15:18
@mydea
mydea requested review from JPeer264 and removed request for a teamJune 11, 2026 15:18
@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from f1ab607 to 070c3c0CompareJune 12, 2026 07:33

@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.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

await runner.makeRequest('get', '/load');
await runner.makeRequest('get', '/load-many');
await runner.makeRequest('get', '/cache-ops');
await runner.makeRequest('get', '/named');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Chained expects assume envelope order

Medium Severity

The test chains four .expect({ transaction: … }) callbacks, but the integration runner matches incoming envelopes with expectedEnvelopes.shift(), so the first callback always runs on the first transaction received—not necessarily GET /load. Four back-to-back HTTP requests can emit transactions in a different order than the expects, causing flaky failures when the wrong callback validates the wrong route.

Fix in CursorFix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

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 should not be possible to flush in a different order

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 946b207 to 837e1dbCompareJune 12, 2026 08:55

@JPeer264JPeer264 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.

so much cleaner now

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 837e1db to f613978CompareJune 15, 2026 08:32
@mydea
mydea merged commit 1bf2bad into developJun 15, 2026
532 of 536 checks passed
@mydea
mydea deleted the fn/streamline-dataloader branch June 15, 2026 09:16
mydea added a commit that referenced this pull request Jun 16, 2026
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
* Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead of
the OTel tracer APIs
* Use the built-in `onlyIfParent` option instead of `requireParentSpan` +
a hand-rolled parent check
* Remove the unused `createHook`/`endHook`/`requireParentSpan` config and
inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
* Streamline the types to what we actually need
* Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
* Add tests covering the previously-untested option gating
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes were gated on `recordErrorMessagesAsSpanAttributes` instead.
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the docs.
Closes#20726
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
mydea added a commit that referenced this pull request Jun 16, 2026
## Summary
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
- Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead
of the OTel tracer APIs
- Use the built-in `onlyIfParent` option instead of `requireParentSpan`
+ a hand-rolled parent check
- Remove the unused `createHook`/`endHook`/`requireParentSpan` config
and inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
- Streamline the types to what we actually need
- Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
- Add tests covering the previously-untested option gating
`context.bind` from `@opentelemetry/api` is kept only for the
callback-style functions, where the user's async callback must be
restored to the parent context (so it isn't parented to the fs span or
caught by tracing suppression) — there is no Sentry equivalent for this.
## Root cause (drive-by bug fix)
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes (`path_argument`, `src_argument`, etc.) were gated on
`recordErrorMessagesAsSpanAttributes` instead (dates back to the
original integration in #13291).
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the documented options.
New integration tests cover each gate in isolation.
Closes#20726
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.

Streamline @opentelemetry/instrumentation-dataloader

2 participants

@mydea@JPeer264
, '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

ref(node): Streamline dataloader instrumentation - #21475

Merged
mydea merged 5 commits into
developfrom
fn/streamline-dataloader
Jun 15, 2026
Merged

ref(node): Streamline dataloader instrumentation#21475
mydea merged 5 commits into
developfrom
fn/streamline-dataloader

Conversation

@mydea

@mydeamydea commented Jun 11, 2026

Copy link
Copy Markdown
Member

This streamlines the vendored dataloader instrumentation:

  • Use Sentry.startSpan instead of tracer APIs
    • this allows us to streamline a bunch of things, e.g. using the built-in onlyIfParent option
  • Remove instrumentation options we hardcode anyhow (we always use onlyIfParent)
  • Streamline types to what we actually need
  • Fix linting errors (remove eslint-disable comment)
  • Add tests covering all methods, actually
  • Moved custom span attributes etc. we had to hackily set in on('spanStart') directly into the instrumentation

This is overall much simpler, as we use the built-in error handling etc. from Sentry.startSpan.

Closes#20725

@mydeamydea self-assigned this Jun 11, 2026
@mydea
mydea requested a review from a team as a code ownerJune 11, 2026 15:18
@mydea
mydea requested review from JPeer264 and removed request for a teamJune 11, 2026 15:18
@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from f1ab607 to 070c3c0CompareJune 12, 2026 07:33

@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.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

await runner.makeRequest('get', '/load');
await runner.makeRequest('get', '/load-many');
await runner.makeRequest('get', '/cache-ops');
await runner.makeRequest('get', '/named');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Chained expects assume envelope order

Medium Severity

The test chains four .expect({ transaction: … }) callbacks, but the integration runner matches incoming envelopes with expectedEnvelopes.shift(), so the first callback always runs on the first transaction received—not necessarily GET /load. Four back-to-back HTTP requests can emit transactions in a different order than the expects, causing flaky failures when the wrong callback validates the wrong route.

Fix in CursorFix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

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 should not be possible to flush in a different order

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 946b207 to 837e1dbCompareJune 12, 2026 08:55

@JPeer264JPeer264 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.

so much cleaner now

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 837e1db to f613978CompareJune 15, 2026 08:32
@mydea
mydea merged commit 1bf2bad into developJun 15, 2026
532 of 536 checks passed
@mydea
mydea deleted the fn/streamline-dataloader branch June 15, 2026 09:16
mydea added a commit that referenced this pull request Jun 16, 2026
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
* Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead of
the OTel tracer APIs
* Use the built-in `onlyIfParent` option instead of `requireParentSpan` +
a hand-rolled parent check
* Remove the unused `createHook`/`endHook`/`requireParentSpan` config and
inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
* Streamline the types to what we actually need
* Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
* Add tests covering the previously-untested option gating
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes were gated on `recordErrorMessagesAsSpanAttributes` instead.
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the docs.
Closes#20726
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
mydea added a commit that referenced this pull request Jun 16, 2026
## Summary
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
- Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead
of the OTel tracer APIs
- Use the built-in `onlyIfParent` option instead of `requireParentSpan`
+ a hand-rolled parent check
- Remove the unused `createHook`/`endHook`/`requireParentSpan` config
and inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
- Streamline the types to what we actually need
- Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
- Add tests covering the previously-untested option gating
`context.bind` from `@opentelemetry/api` is kept only for the
callback-style functions, where the user's async callback must be
restored to the parent context (so it isn't parented to the fs span or
caught by tracing suppression) — there is no Sentry equivalent for this.
## Root cause (drive-by bug fix)
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes (`path_argument`, `src_argument`, etc.) were gated on
`recordErrorMessagesAsSpanAttributes` instead (dates back to the
original integration in #13291).
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the documented options.
New integration tests cover each gate in isolation.
Closes#20726
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.

Streamline @opentelemetry/instrumentation-dataloader

2 participants

@mydea@JPeer264
, '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

ref(node): Streamline dataloader instrumentation - #21475

Merged
mydea merged 5 commits into
developfrom
fn/streamline-dataloader
Jun 15, 2026
Merged

ref(node): Streamline dataloader instrumentation#21475
mydea merged 5 commits into
developfrom
fn/streamline-dataloader

Conversation

@mydea

@mydeamydea commented Jun 11, 2026

Copy link
Copy Markdown
Member

This streamlines the vendored dataloader instrumentation:

  • Use Sentry.startSpan instead of tracer APIs
    • this allows us to streamline a bunch of things, e.g. using the built-in onlyIfParent option
  • Remove instrumentation options we hardcode anyhow (we always use onlyIfParent)
  • Streamline types to what we actually need
  • Fix linting errors (remove eslint-disable comment)
  • Add tests covering all methods, actually
  • Moved custom span attributes etc. we had to hackily set in on('spanStart') directly into the instrumentation

This is overall much simpler, as we use the built-in error handling etc. from Sentry.startSpan.

Closes#20725

@mydeamydea self-assigned this Jun 11, 2026
@mydea
mydea requested a review from a team as a code ownerJune 11, 2026 15:18
@mydea
mydea requested review from JPeer264 and removed request for a teamJune 11, 2026 15:18
@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from f1ab607 to 070c3c0CompareJune 12, 2026 07:33

@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.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

await runner.makeRequest('get', '/load');
await runner.makeRequest('get', '/load-many');
await runner.makeRequest('get', '/cache-ops');
await runner.makeRequest('get', '/named');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Chained expects assume envelope order

Medium Severity

The test chains four .expect({ transaction: … }) callbacks, but the integration runner matches incoming envelopes with expectedEnvelopes.shift(), so the first callback always runs on the first transaction received—not necessarily GET /load. Four back-to-back HTTP requests can emit transactions in a different order than the expects, causing flaky failures when the wrong callback validates the wrong route.

Fix in CursorFix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

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 should not be possible to flush in a different order

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 946b207 to 837e1dbCompareJune 12, 2026 08:55

@JPeer264JPeer264 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.

so much cleaner now

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 837e1db to f613978CompareJune 15, 2026 08:32
@mydea
mydea merged commit 1bf2bad into developJun 15, 2026
532 of 536 checks passed
@mydea
mydea deleted the fn/streamline-dataloader branch June 15, 2026 09:16
mydea added a commit that referenced this pull request Jun 16, 2026
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
* Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead of
the OTel tracer APIs
* Use the built-in `onlyIfParent` option instead of `requireParentSpan` +
a hand-rolled parent check
* Remove the unused `createHook`/`endHook`/`requireParentSpan` config and
inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
* Streamline the types to what we actually need
* Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
* Add tests covering the previously-untested option gating
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes were gated on `recordErrorMessagesAsSpanAttributes` instead.
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the docs.
Closes#20726
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
mydea added a commit that referenced this pull request Jun 16, 2026
## Summary
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
- Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead
of the OTel tracer APIs
- Use the built-in `onlyIfParent` option instead of `requireParentSpan`
+ a hand-rolled parent check
- Remove the unused `createHook`/`endHook`/`requireParentSpan` config
and inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
- Streamline the types to what we actually need
- Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
- Add tests covering the previously-untested option gating
`context.bind` from `@opentelemetry/api` is kept only for the
callback-style functions, where the user's async callback must be
restored to the parent context (so it isn't parented to the fs span or
caught by tracing suppression) — there is no Sentry equivalent for this.
## Root cause (drive-by bug fix)
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes (`path_argument`, `src_argument`, etc.) were gated on
`recordErrorMessagesAsSpanAttributes` instead (dates back to the
original integration in #13291).
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the documented options.
New integration tests cover each gate in isolation.
Closes#20726
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.

Streamline @opentelemetry/instrumentation-dataloader

2 participants

@mydea@JPeer264
, '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

ref(node): Streamline dataloader instrumentation - #21475

Merged
mydea merged 5 commits into
developfrom
fn/streamline-dataloader
Jun 15, 2026
Merged

ref(node): Streamline dataloader instrumentation#21475
mydea merged 5 commits into
developfrom
fn/streamline-dataloader

Conversation

@mydea

@mydeamydea commented Jun 11, 2026

Copy link
Copy Markdown
Member

This streamlines the vendored dataloader instrumentation:

  • Use Sentry.startSpan instead of tracer APIs
    • this allows us to streamline a bunch of things, e.g. using the built-in onlyIfParent option
  • Remove instrumentation options we hardcode anyhow (we always use onlyIfParent)
  • Streamline types to what we actually need
  • Fix linting errors (remove eslint-disable comment)
  • Add tests covering all methods, actually
  • Moved custom span attributes etc. we had to hackily set in on('spanStart') directly into the instrumentation

This is overall much simpler, as we use the built-in error handling etc. from Sentry.startSpan.

Closes#20725

@mydeamydea self-assigned this Jun 11, 2026
@mydea
mydea requested a review from a team as a code ownerJune 11, 2026 15:18
@mydea
mydea requested review from JPeer264 and removed request for a teamJune 11, 2026 15:18
@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from f1ab607 to 070c3c0CompareJune 12, 2026 07:33

@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.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

await runner.makeRequest('get', '/load');
await runner.makeRequest('get', '/load-many');
await runner.makeRequest('get', '/cache-ops');
await runner.makeRequest('get', '/named');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Chained expects assume envelope order

Medium Severity

The test chains four .expect({ transaction: … }) callbacks, but the integration runner matches incoming envelopes with expectedEnvelopes.shift(), so the first callback always runs on the first transaction received—not necessarily GET /load. Four back-to-back HTTP requests can emit transactions in a different order than the expects, causing flaky failures when the wrong callback validates the wrong route.

Fix in CursorFix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

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 should not be possible to flush in a different order

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 946b207 to 837e1dbCompareJune 12, 2026 08:55

@JPeer264JPeer264 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.

so much cleaner now

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 837e1db to f613978CompareJune 15, 2026 08:32
@mydea
mydea merged commit 1bf2bad into developJun 15, 2026
532 of 536 checks passed
@mydea
mydea deleted the fn/streamline-dataloader branch June 15, 2026 09:16
mydea added a commit that referenced this pull request Jun 16, 2026
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
* Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead of
the OTel tracer APIs
* Use the built-in `onlyIfParent` option instead of `requireParentSpan` +
a hand-rolled parent check
* Remove the unused `createHook`/`endHook`/`requireParentSpan` config and
inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
* Streamline the types to what we actually need
* Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
* Add tests covering the previously-untested option gating
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes were gated on `recordErrorMessagesAsSpanAttributes` instead.
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the docs.
Closes#20726
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
mydea added a commit that referenced this pull request Jun 16, 2026
## Summary
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
- Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead
of the OTel tracer APIs
- Use the built-in `onlyIfParent` option instead of `requireParentSpan`
+ a hand-rolled parent check
- Remove the unused `createHook`/`endHook`/`requireParentSpan` config
and inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
- Streamline the types to what we actually need
- Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
- Add tests covering the previously-untested option gating
`context.bind` from `@opentelemetry/api` is kept only for the
callback-style functions, where the user's async callback must be
restored to the parent context (so it isn't parented to the fs span or
caught by tracing suppression) — there is no Sentry equivalent for this.
## Root cause (drive-by bug fix)
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes (`path_argument`, `src_argument`, etc.) were gated on
`recordErrorMessagesAsSpanAttributes` instead (dates back to the
original integration in #13291).
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the documented options.
New integration tests cover each gate in isolation.
Closes#20726
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.

Streamline @opentelemetry/instrumentation-dataloader

2 participants

@mydea@JPeer264
, '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

ref(node): Streamline dataloader instrumentation - #21475

Merged
mydea merged 5 commits into
developfrom
fn/streamline-dataloader
Jun 15, 2026
Merged

ref(node): Streamline dataloader instrumentation#21475
mydea merged 5 commits into
developfrom
fn/streamline-dataloader

Conversation

@mydea

@mydeamydea commented Jun 11, 2026

Copy link
Copy Markdown
Member

This streamlines the vendored dataloader instrumentation:

  • Use Sentry.startSpan instead of tracer APIs
    • this allows us to streamline a bunch of things, e.g. using the built-in onlyIfParent option
  • Remove instrumentation options we hardcode anyhow (we always use onlyIfParent)
  • Streamline types to what we actually need
  • Fix linting errors (remove eslint-disable comment)
  • Add tests covering all methods, actually
  • Moved custom span attributes etc. we had to hackily set in on('spanStart') directly into the instrumentation

This is overall much simpler, as we use the built-in error handling etc. from Sentry.startSpan.

Closes#20725

@mydeamydea self-assigned this Jun 11, 2026
@mydea
mydea requested a review from a team as a code ownerJune 11, 2026 15:18
@mydea
mydea requested review from JPeer264 and removed request for a teamJune 11, 2026 15:18
@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from f1ab607 to 070c3c0CompareJune 12, 2026 07:33

@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.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

await runner.makeRequest('get', '/load');
await runner.makeRequest('get', '/load-many');
await runner.makeRequest('get', '/cache-ops');
await runner.makeRequest('get', '/named');

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Chained expects assume envelope order

Medium Severity

The test chains four .expect({ transaction: … }) callbacks, but the integration runner matches incoming envelopes with expectedEnvelopes.shift(), so the first callback always runs on the first transaction received—not necessarily GET /load. Four back-to-back HTTP requests can emit transactions in a different order than the expects, causing flaky failures when the wrong callback validates the wrong route.

Fix in CursorFix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit 070c3c0. Configure here.

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 should not be possible to flush in a different order

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 946b207 to 837e1dbCompareJune 12, 2026 08:55

@JPeer264JPeer264 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.

so much cleaner now

@mydea
mydeaforce-pushed the fn/streamline-dataloader branch from 837e1db to f613978CompareJune 15, 2026 08:32
@mydea
mydea merged commit 1bf2bad into developJun 15, 2026
532 of 536 checks passed
@mydea
mydea deleted the fn/streamline-dataloader branch June 15, 2026 09:16
mydea added a commit that referenced this pull request Jun 16, 2026
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
* Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead of
the OTel tracer APIs
* Use the built-in `onlyIfParent` option instead of `requireParentSpan` +
a hand-rolled parent check
* Remove the unused `createHook`/`endHook`/`requireParentSpan` config and
inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
* Streamline the types to what we actually need
* Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
* Add tests covering the previously-untested option gating
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes were gated on `recordErrorMessagesAsSpanAttributes` instead.
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the docs.
Closes#20726
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
mydea added a commit that referenced this pull request Jun 16, 2026
## Summary
This streamlines the vendored `fs` instrumentation, following the same
approach as the dataloader (#21475) and generic-pool (#21523) refactors:
- Use `Sentry.startSpan`/`startInactiveSpan`/`suppressTracing` instead
of the OTel tracer APIs
- Use the built-in `onlyIfParent` option instead of `requireParentSpan`
+ a hand-rolled parent check
- Remove the unused `createHook`/`endHook`/`requireParentSpan` config
and inline the span name, `op`/`origin` and file-path/error attributes
directly into the instrumentation
- Streamline the types to what we actually need
- Remove the `/* eslint-disable */` and make the vendored files pass the
(type-aware) linter
- Add tests covering the previously-untested option gating
`context.bind` from `@opentelemetry/api` is kept only for the
callback-style functions, where the user's async callback must be
restored to the parent context (so it isn't parented to the fs span or
caught by tracing suppression) — there is no Sentry equivalent for this.
## Root cause (drive-by bug fix)
While inlining the attribute logic, this also fixes a pre-existing bug:
the documented `recordFilePaths` option was never read — file-path span
attributes (`path_argument`, `src_argument`, etc.) were gated on
`recordErrorMessagesAsSpanAttributes` instead (dates back to the
original integration in #13291).
File paths are now gated on `recordFilePaths` and error messages on
`recordErrorMessagesAsSpanAttributes`, matching the documented options.
New integration tests cover each gate in isolation.
Closes#20726
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.

Streamline @opentelemetry/instrumentation-dataloader

2 participants

@mydea@JPeer264