fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(monitoring): observe database connection opening/closing

Browse Source
This commit is contained in:
Gregor Kleen 2021-02-23 20:33:05 +01:00
parent 0e92d71b31
commit d801a2f84a
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Application.hs
View File

@ -249,11 +249,13 @@ makeFoundation appSettings''@AppSettings{..} = do
$logDebugS "SqlPool" "Opening connection..." $logDebugS "SqlPool" "Opening connection..."
conn <- liftIO . PG.connectPostgreSQL $ pgConnStr appDatabaseConf conn <- liftIO . PG.connectPostgreSQL $ pgConnStr appDatabaseConf
backend <- liftIO $ openSimpleConn logFunc conn backend <- liftIO $ openSimpleConn logFunc conn
observeDatabaseConnectionOpened
$logInfoS "SqlPool" "Opened connection" $logInfoS "SqlPool" "Opened connection"
return backend return backend
destroy conn = do destroy conn = do
$logDebugS "SqlPool" "Closing connection..." $logDebugS "SqlPool" "Closing connection..."
liftIO $ connClose conn liftIO $ connClose conn
observeDatabaseConnectionClosed
$logInfoS "SqlPool" "Closed connection" $logInfoS "SqlPool" "Closed connection"
in Custom.createPool (liftIO . flip runLoggingT logFunc) create destroy (Just . fromIntegral $ pgPoolIdleTimeout appDatabaseConf) (Just $ pgPoolSize appDatabaseConf) in Custom.createPool (liftIO . flip runLoggingT logFunc) create destroy (Just . fromIntegral $ pgPoolIdleTimeout appDatabaseConf) (Just $ pgPoolSize appDatabaseConf)
let sqlPool :: forall m. MonadIO m => Custom.Pool m SqlBackend let sqlPool :: forall m. MonadIO m => Custom.Pool m SqlBackend

17
src/Utils/Metrics.hs
View File

@ -22,6 +22,7 @@ module Utils.Metrics
, InjectInhibitMetrics, injectInhibitMetrics , InjectInhibitMetrics, injectInhibitMetrics
, PoolMetrics, PoolLabel(..) , PoolMetrics, PoolLabel(..)
, poolMetrics , poolMetrics
, observeDatabaseConnectionOpened, observeDatabaseConnectionClosed
) where ) where
import Import.NoModel hiding (Vector, Info) import Import.NoModel hiding (Vector, Info)
@ -218,6 +219,18 @@ rechunkedFilesBytes = unsafeRegister $ counter info
where info = Info "uni2work_rechunked_files_bytes" where info = Info "uni2work_rechunked_files_bytes"
"Size of files rechunked within database" "Size of files rechunked within database"
{-# NOINLINE databaseConnectionsOpened #-}
databaseConnectionsOpened :: Counter
databaseConnectionsOpened = unsafeRegister $ counter info
where info = Info "uni2work_database_connections_opened"
"Number of new connections to database opened"
{-# NOINLINE databaseConnectionsClosed #-}
databaseConnectionsClosed :: Counter
databaseConnectionsClosed = unsafeRegister $ counter info
where info = Info "uni2work_database_connections_closed"
"Number of connections to database closed"
data JobWorkerQueueDepth = MkJobWorkerQueueDepth data JobWorkerQueueDepth = MkJobWorkerQueueDepth
jobWorkerQueueDepth :: TMVar JobState -> Metric JobWorkerQueueDepth jobWorkerQueueDepth :: TMVar JobState -> Metric JobWorkerQueueDepth
@ -515,3 +528,7 @@ registerJobWorkerQueueDepth = liftIO . void . register . jobWorkerQueueDepth
observeMissingFiles :: MonadIO m => Text -> Int -> m () observeMissingFiles :: MonadIO m => Text -> Int -> m ()
observeMissingFiles refIdent = liftIO . withLabel missingFiles refIdent . flip setGauge . fromIntegral observeMissingFiles refIdent = liftIO . withLabel missingFiles refIdent . flip setGauge . fromIntegral
observeDatabaseConnectionOpened, observeDatabaseConnectionClosed :: MonadIO m => m ()
observeDatabaseConnectionOpened = liftIO $ incCounter databaseConnectionsOpened
observeDatabaseConnectionClosed = liftIO $ incCounter databaseConnectionsClosed