Skip to content

Log query execution time. #268

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Log query execution time. #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion Sources/PostgresKit/PostgresDatabase+SQL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import PostgresNIO
import Dispatch
import Logging
import SQLKit

Expand Down Expand Up @@ -47,6 +48,9 @@ extension PostgresSQLDatabase: SQLDatabase, PostgresDatabase {
if let queryLogLevel = self.queryLogLevel {
self.logger.log(level: queryLogLevel, "Executing query", metadata: ["sql": .string(sql), "binds": .array(binds.map { .string("\($0)") })])
}

let startTime = DispatchTime.now()

return self.eventLoop.makeCompletedFuture {
var bindings = PostgresBindings(capacity: binds.count)
for bind in binds {
Expand All @@ -59,7 +63,16 @@ extension PostgresSQLDatabase: SQLDatabase, PostgresDatabase {
logger: $0.logger,
{ onRow($0.sql(decodingContext: self.decodingContext)) }
)
} }.map { _ in }
} }.map { _ in
if let queryLogLevel = self.queryLogLevel {
let executionTime = Int(DispatchTime.now().uptimeNanoseconds / UInt64(1_000_000)
- startTime.uptimeNanoseconds / UInt64(1_000_000))
self.logger.log(level: queryLogLevel, "Query executed in \(executionTime) ms",
metadata: ["sql": .string(sql),
"binds": .array(binds.map { .string("\($0)") }),
"execution_time_ms" : .stringConvertible(executionTime)])
}
}
}

func execute(
Expand All @@ -72,6 +85,8 @@ extension PostgresSQLDatabase: SQLDatabase, PostgresDatabase {
self.logger.log(level: queryLogLevel, "Executing query", metadata: ["sql": .string(sql), "binds": .array(binds.map { .string("\($0)") })])
}

let startTime = DispatchTime.now()

var bindings = PostgresBindings(capacity: binds.count)
for bind in binds {
try PostgresDataTranslation.encode(value: bind, in: self.encodingContext, to: &bindings)
Expand All @@ -84,6 +99,15 @@ extension PostgresSQLDatabase: SQLDatabase, PostgresDatabase {
{ onRow($0.sql(decodingContext: self.decodingContext)) }
)
}.get()

if let queryLogLevel = self.queryLogLevel {
let executionTime = Int(DispatchTime.now().uptimeNanoseconds / UInt64(1_000_000)
- startTime.uptimeNanoseconds / UInt64(1_000_000))
self.logger.log(level: queryLogLevel, "Query executed in \(executionTime) ms",
metadata: ["sql": .string(sql),
"binds": .array(binds.map { .string("\($0)") }),
"execution_time_ms" : .stringConvertible(executionTime)])
}
}


Expand Down