Uh oh!
There was an error while loading. Please reload this page.
ref(node): Migrate vendored generic-pool instrumentation to Sentry APIs - #21523
Merged
Conversation
Replace the OTel tracer/context span lifecycle in the vendored generic-pool instrumentation with `startSpan`/`startSpanManual` from `@sentry/core`, and set an error status on failed acquires. Adds error-path integration tests for both the v3 (promise) and v2 (callback) paths. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
nicohrubecforce-pushed
the
feat/generic-pool-vendored-sentry-apis
branch
from
June 15, 2026 08:41
8aa80ed to
2146bfaComparenicohrubec
commented
Jun 15, 2026
| original.call( | ||
| this, | ||
| (err: unknown, client: unknown) => { | ||
| if (err) { |
MemberAuthor
There was a problem hiding this comment.
this aligns the v2 and v3 error path (so both set internal error on the span)
Contributor
size-limit report 📦
|
nicohrubec
marked this pull request as ready for review
June 15, 2026 09:33
nicohrubec
requested review from
JPeer264, andreiborza and mydea
and removed request for
a teamJune 15, 2026 09:33
andreiborza
approved these changes
Jun 15, 2026
Uh oh!
There was an error while loading. Please reload this page.
48 tasks
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Migrate the vendored generic-pool instrumentation off the OTel tracer/context APIs to
startSpan/startSpanManualfrom@sentry/core.