Uh oh!
There was an error while loading. Please reload this page.
ref(node): Streamline Prisma instrumentation (v6 and v7) - #21819
Merged
Conversation
s1gr1d
requested review from
JPeer264, andreiborza, mydea and nicohrubec
and removed request for
a teamJune 26, 2026 13:45
Uh oh!
There was an error while loading. Please reload this page.
Contributor
size-limit report 📦
|
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Comment on lines
+90
to
92
| public getActiveContext(): Span | undefined { | ||
| return getActiveSpan(); | ||
| } |
Member
There was a problem hiding this comment.
This seems weird to me 😬 but I can't tell if it's ok or not. We'd need to investigate when exactly getActiveContext was called before and if it's fine receiving a span now?
Member
There was a problem hiding this comment.
from what I can tell this should be fine, the output of getActiveContext is only used by getTraceParent which we also control
| } | ||
| const context = options.context ?? _context.active(); | ||
| const parentSpan = options.context ?? getActiveSpan(); |
Member
There was a problem hiding this comment.
Also here, context being a span, is that right?
Member
There was a problem hiding this comment.
options.context was dead it seems, so I simplified this
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 2 potential issues.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit f769463. Configure here.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
andreiborza
approved these changes
Jun 30, 2026
Uh oh!
There was an error while loading. Please reload this page.
andreiborza added a commit
that referenced
this pull request
Jul 6, 2026
Reworks the Prisma v5 engine-span compatibility shim off the OTel SDK tracer's private `_idGenerator` and onto Sentry's provider-agnostic span APIs. This is the v5 counterpart of #21819 (which streamlined v6/v7). Engine spans are now minted via `startInactiveSpan`, reparented by id through a bounded `LRUMap` registry plus a `pendingEngineSpans` buffer that resolves spans Prisma dispatches out of order across batches. The v5 integration test is re-enabled and a `BasicTracerProvider` variant is added, so v5 is verified under both the default `SentryTracerProvider` and the opt-in OTel `BasicTracerProvider` (`openTelemetryBasicTracerProvider: true`). _Root cause_: The `SentryTracerProvider` became the default tracer provider. Its `SentryTracer` creates native Sentry spans and has no `_idGenerator`, so the v5 shim (which hijacked that private field to mint spans with the engine's exact ids) hit its guard, warned, and dropped every `prisma:engine:*` span, leaving only the `prisma:client:*` spans. Closes: #21821 --------- Co-authored-by: Claude Opus 4.8 <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
3 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.
Streamlines the vendored Prisma instrumentation onto Sentry's span APIs (v6/v7):
spanStarthook into span creation in the instrumentation.startSpanManual/startInactiveSpanfrom@sentry/coreinstead of the OTel tracer in the vendored tracing helper.setTracerProvider/tracerProviderand unused contract types (EngineTrace,EngineTraceEvent,LogLevel).v5 cleanup will be done in a followup.
Part of #20744
Closes#21820