Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 1.8k
feat(cloudflare): Expose prismaIntegration in nodejs_compat export#21882
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
JPeer264
merged 1 commit into
jp/add-nodejs-compat-entrypoint
from
jp/export-prisma-cloudflareJul 7, 2026
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
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
4 changes: 4 additions & 0 deletions
4 dev-packages/cloudflare-integration-tests/suites/prisma/.gitignore
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| generated/ | ||
| .wrangler/ | ||
| *.db | ||
| *.db-journal |
34 changes: 34 additions & 0 deletions
34 dev-packages/cloudflare-integration-tests/suites/prisma/index.ts
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import type { D1Database } from '@cloudflare/workers-types'; | ||
| import { PrismaD1 } from '@prisma/adapter-d1'; | ||
| import * as Sentry from '@sentry/cloudflare/nodejs_compat'; | ||
| import { PrismaClient } from './generated'; | ||
| interface Env { | ||
| SENTRY_DSN: string; | ||
| DB: D1Database; | ||
| } | ||
| export default Sentry.withSentry( | ||
| (env: Env) => ({ | ||
| dsn: env.SENTRY_DSN, | ||
| tracesSampleRate: 1, | ||
| integrations: [Sentry.prismaIntegration()], | ||
| }), | ||
| { | ||
| async fetch(_request, env) { | ||
| // miniflare starts with an empty D1 database, so create the table Prisma expects. | ||
| await env.DB.exec( | ||
| 'CREATE TABLE IF NOT EXISTS User (id INTEGER PRIMARY KEY AUTOINCREMENT, email TEXT NOT NULL UNIQUE, name TEXT)', | ||
| ); | ||
| const adapter = new PrismaD1(env.DB); | ||
| const prisma = new PrismaClient({ adapter }); | ||
| const users = await prisma.user.findMany(); | ||
| return new Response(JSON.stringify(users), { | ||
| headers: { 'Content-Type': 'application/json' }, | ||
| }); | ||
| }, | ||
| } satisfies ExportedHandler<Env>, | ||
| ); |
16 changes: 16 additions & 0 deletions
16 dev-packages/cloudflare-integration-tests/suites/prisma/schema.prisma
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| generator client { | ||
| provider = "prisma-client-js" | ||
| output = "./generated" | ||
| previewFeatures = ["driverAdapters"] | ||
| } | ||
| datasource db { | ||
| provider = "sqlite" | ||
| url = "file:./dev.db" | ||
| } | ||
| model User { | ||
| id Int @id @default(autoincrement()) | ||
| email String @unique | ||
| name String? | ||
| } |
85 changes: 85 additions & 0 deletions
85 dev-packages/cloudflare-integration-tests/suites/prisma/test.ts
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| import { execSync } from 'node:child_process'; | ||
| import { join } from 'node:path'; | ||
| import type { Envelope } from '@sentry/core'; | ||
| import { beforeAll, expect, it } from 'vitest'; | ||
| import { createRunner } from '../../runner'; | ||
| beforeAll(() => { | ||
| // Generate the Prisma client (including the WASM query engine used on Workers) before wrangler | ||
| // bundles the worker. The generated client (output: "./generated") is gitignored. | ||
| execSync(`yarn prisma generate --schema ${join(__dirname, 'schema.prisma')}`, { cwd: __dirname, stdio: 'inherit' }); | ||
| }, 120_000); | ||
| function envelopeItemType(envelope: Envelope): string | undefined { | ||
| return envelope[1][0]?.[0]?.type as string | undefined; | ||
| } | ||
| function envelopeItem(envelope: Envelope): Record<string, unknown> { | ||
| return envelope[1][0]![1] as Record<string, unknown>; | ||
| } | ||
| it('captures a transaction with Prisma spans for a D1 query via the @sentry/cloudflare/nodejs_compat prismaIntegration', async ({ | ||
| signal, | ||
| }) => { | ||
| const runner = createRunner(__dirname) | ||
| .ignore('event') | ||
| .expect((envelope: Envelope) => { | ||
| expect(envelopeItemType(envelope)).toBe('transaction'); | ||
| const transaction = envelopeItem(envelope); | ||
| const trace = (transaction.contexts as Record<string, Record<string, unknown>> | undefined)?.trace; | ||
| expect(transaction.transaction).toBe('GET /users'); | ||
| expect(trace?.op).toBe('http.server'); | ||
| expect(trace?.origin).toBe('auto.http.cloudflare'); | ||
| expect(trace?.status).toBe('ok'); | ||
| const createUserTableQuery = | ||
| 'CREATE TABLE IF NOT EXISTS User (id INTEGER PRIMARY KEY AUTOINCREMENT, email TEXT NOT NULL UNIQUE, name TEXT)'; | ||
| const selectUsersQuery = | ||
| 'SELECT `main`.`User`.`id`, `main`.`User`.`email`, `main`.`User`.`name` FROM `main`.`User` WHERE 1=1 LIMIT ? OFFSET ?'; | ||
| // Only the span shape is stable here - ids, timestamps, and parent ids are not. | ||
| const spans = ((transaction.spans as Array<Record<string, unknown>>) || []).map(span => ({ | ||
| description: span.description, | ||
| op: span.op, | ||
| origin: span.origin, | ||
| })); | ||
| expect(spans).toHaveLength(16); | ||
| expect(spans).toEqual( | ||
| expect.arrayContaining([ | ||
| { | ||
| description: createUserTableQuery, | ||
| op: 'db.query', | ||
| origin: 'auto.db.cloudflare.d1', | ||
| }, | ||
| { | ||
| description: expect.stringMatching( | ||
| /^SELECT `main`\.`User`\.`id`, `main`\.`User`\.`email`, `main`\.`User`\.`name` FROM `main`\.`User` WHERE 1=1 LIMIT \? OFFSET \? \/\* traceparent='00-[\da-f]{32}-[\da-f]{16}-01' \*\/$/, | ||
| ), | ||
| op: 'db.query', | ||
| origin: 'auto.db.cloudflare.d1', | ||
| }, | ||
| { description: 'prisma:client:connect', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:client:load_engine', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:client:operation', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:client:serialize', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:engine:connect', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:engine:connection', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:engine:query', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: selectUsersQuery, op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:engine:js:query:args', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:engine:js:query:sql', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:engine:js:query:result', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:engine:serialize', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| { description: 'prisma:engine:response_json_serialization', op: undefined, origin: 'auto.db.otel.prisma' }, | ||
| ]), | ||
| ); | ||
| expect(spans.filter(span => span.description === 'prisma:engine:connection')).toHaveLength(2); | ||
| }) | ||
| .start(signal); | ||
| await runner.makeRequest('get', '/users'); | ||
| await runner.completed(); | ||
| }); | ||
13 changes: 13 additions & 0 deletions
13 dev-packages/cloudflare-integration-tests/suites/prisma/wrangler.jsonc
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "name": "prisma-d1-test-worker", | ||
| "compatibility_date": "2025-06-17", | ||
| "main": "index.ts", | ||
| "compatibility_flags": ["nodejs_compat"], | ||
| "d1_databases": [ | ||
| { | ||
| "binding": "DB", | ||
| "database_name": "test-db", | ||
| "database_id": "00000000-0000-0000-0000-000000000000", | ||
| }, | ||
| ], | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| export * from '../index'; | ||
| export { prismaIntegration } from '@sentry/node'; |
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
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.