Skip to content

Commit a59aebc

Browse files
fix: update @prisma/instrumentation to v7, fix pool timeout mapping
- Bump @prisma/instrumentation from ^6.14.0 to ^7.7.0 for Prisma 7 compatibility - Fix DATABASE_POOL_TIMEOUT incorrectly mapped to idleTimeoutMillis (semantic mismatch) - pool_timeout was a connection acquisition timeout, idleTimeoutMillis is idle eviction - Use DATABASE_CONNECTION_TIMEOUT for idleTimeoutMillis instead (pg Pool has no direct acquisition timeout equivalent) Co-Authored-By: Eric Allam <eallam@icloud.com>
1 parent 1622138 commit a59aebc

File tree

3 files changed

+55
-19
lines changed

3 files changed

+55
-19
lines changed

apps/webapp/app/db.server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function getClient() {
120120
const adapter = new PrismaPg({
121121
connectionString: databaseUrl.href,
122122
max: env.DATABASE_CONNECTION_LIMIT,
123-
idleTimeoutMillis: env.DATABASE_POOL_TIMEOUT * 1000,
123+
idleTimeoutMillis: env.DATABASE_CONNECTION_TIMEOUT * 1000,
124124
connectionTimeoutMillis: env.DATABASE_CONNECTION_TIMEOUT * 1000,
125125
});
126126

@@ -243,7 +243,7 @@ function getReplicaClient() {
243243
const adapter = new PrismaPg({
244244
connectionString: replicaUrl.href,
245245
max: env.DATABASE_CONNECTION_LIMIT,
246-
idleTimeoutMillis: env.DATABASE_POOL_TIMEOUT * 1000,
246+
idleTimeoutMillis: env.DATABASE_CONNECTION_TIMEOUT * 1000,
247247
connectionTimeoutMillis: env.DATABASE_CONNECTION_TIMEOUT * 1000,
248248
});
249249

apps/webapp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"@opentelemetry/sdk-trace-node": "2.0.1",
8989
"@opentelemetry/semantic-conventions": "1.36.0",
9090
"@popperjs/core": "^2.11.8",
91-
"@prisma/instrumentation": "^6.14.0",
91+
"@prisma/instrumentation": "^7.7.0",
9292
"@radix-ui/react-accordion": "^1.2.11",
9393
"@radix-ui/react-alert-dialog": "^1.0.4",
9494
"@radix-ui/react-dialog": "^1.0.3",

pnpm-lock.yaml

Lines changed: 52 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)