Skip to content

Commit 223b83b

Browse files
committed
chore: apply pr comment
1 parent 5773373 commit 223b83b

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

src/lib/PostgresMeta.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { init } from './db.js'
2222
import { PostgresMetaResult, PoolConfig } from './types.js'
2323

2424
export default class PostgresMeta {
25-
query: (sql: string, customQuery?: boolean) => Promise<PostgresMetaResult<any>>
25+
query: (sql: string, trackQueryInSentry?: boolean) => Promise<PostgresMetaResult<any>>
2626
end: () => Promise<void>
2727
columnPrivileges: PostgresMetaColumnPrivileges
2828
columns: PostgresMetaColumns

src/lib/db.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const poolerQueryHandleError = (pgpool: pg.Pool, sql: string): Promise<pg.QueryR
6262
}
6363

6464
export const init: (config: PoolConfig) => {
65-
query: (sql: string, customQuery?: boolean) => Promise<PostgresMetaResult<any>>
65+
query: (sql: string, trackQueryInSentry?: boolean) => Promise<PostgresMetaResult<any>>
6666
end: () => Promise<void>
6767
} = (config) => {
6868
return Sentry.startSpan({ op: 'db', name: 'db.init' }, () => {
@@ -103,10 +103,14 @@ export const init: (config: PoolConfig) => {
103103
let pool: pg.Pool | null = new pg.Pool(config)
104104

105105
return {
106-
async query(sql, customQuery = false) {
106+
async query(sql, trackQueryInSentry = true) {
107107
return Sentry.startSpan(
108108
// For metrics purposes, log the query that will be run if it's not an user provided query (with possibly sentitives infos)
109-
{ op: 'db', name: 'init.query', attributes: { sql: customQuery ? 'custom' : sql } },
109+
{
110+
op: 'db',
111+
name: 'init.query',
112+
attributes: { sql: trackQueryInSentry ? sql : 'custom' },
113+
},
110114
async () => {
111115
try {
112116
if (!pool) {

src/server/routes/query.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default async (fastify: FastifyInstance) => {
2121
const connectionString = request.headers.pg
2222

2323
const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
24-
const { data, error } = await pgMeta.query(request.body.query, true)
24+
const { data, error } = await pgMeta.query(request.body.query, false)
2525
await pgMeta.end()
2626
if (error) {
2727
request.log.error({ error, request: extractRequestForLogging(request) })

0 commit comments

Comments
 (0)