Skip to content
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

Jump to bottom

Metric for number of open connections #49

Closed
wants to merge 18 commits into from
Closed

Metric for number of open connections #49

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c0cd6fa
working on adding a metric to track connections
nhyne May 15, 2022
289b3d9
metrics on acquire/release of connection
nhyne May 23, 2022
669e3c8
formatting
nhyne May 23, 2022
613a998
trigger CI
nhyne May 23, 2022
1cc527d
8.0 connections
nhyne May 26, 2022
bbd917a
changing metric name based on john's feedback
nhyne May 26, 2022
5f19e9e
switching back to greater than 0 connections
nhyne May 26, 2022
ef1a9b2
changing to gauge
nhyne May 27, 2022
24fdbc7
zipping metric value
nhyne May 27, 2022
94e71f7
CI failing but tests passing locally
nhyne May 27, 2022
906f592
Merge remote-tracking branch 'upstream/main' into nhyne/connection-me…
nhyne Jun 7, 2022
c23946e
switching to GTEQ since we could have the same #
nhyne Jun 7, 2022
88e1cfc
select 1 instead
nhyne Jun 8, 2022
54a2f5f
test change
nhyne Jun 8, 2022
30985fb
zip left instead
nhyne Jul 1, 2022
6e2af2c
removing unused imports
nhyne Jul 1, 2022
ecfe61d
zipRight again
nhyne Jul 1, 2022
b8661a3
no as
nhyne Jul 1, 2022
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
6 changes: 5 additions & 1 deletion core/src/main/scala/zio/jdbc/ZConnectionPool.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import java.sql.Connection
*/
final case class ZConnectionPool(transaction: ZLayer[Any, Throwable, ZConnection])
object ZConnectionPool {
private[jdbc] val connectionsCounter = zio.metrics.Metric.counterInt("zio_jdbc_open_connections")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need a Gauge here because some metric systems do not allow incrementing by negative numbers.

Otherwise, looks good to merge!


def h2test: ZLayer[Any, Throwable, ZConnectionPool] =
ZLayer.scoped {
for {
Expand Down Expand Up @@ -157,7 +159,9 @@ object ZConnectionPool {
ZLayer.scoped {
for {
config <- ZIO.service[ZConnectionPoolConfig]
managed = ZIO.acquireRelease(acquire.retry(config.retryPolicy))(conn => ZIO.succeed(conn.close()))
managed = ZIO.acquireRelease(acquire.retry(config.retryPolicy).zipLeft(connectionsCounter.increment))(conn =>
connectionsCounter.incrementBy(-1).as(conn.close())
)
pool <-
ZPool
.make(managed.map(ZConnection(_)), Range(config.minConnections, config.maxConnections), config.timeToLive)
Expand Down
7 changes: 7 additions & 0 deletions core/src/test/scala/zio/jdbc/ZConnectionPoolSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package zio.jdbc
import zio._
import zio.schema._
import zio.test.TestAspect._
import zio.test.Assertion.isGreaterThan
import zio.test._

object ZConnectionPoolSpec extends ZIOSpecDefault {
Expand Down Expand Up @@ -53,6 +54,12 @@ object ZConnectionPoolSpec extends ZIOSpecDefault {
for {
_ <- ZIO.scoped(ZConnectionPool.h2test.build)
} yield assertCompletes
} + test("increment on connection acquisition") {
for {
initalState <- ZConnectionPool.connectionsCounter.value
_ <- transaction(execute(sql""))
state <- ZConnectionPool.connectionsCounter.value
} yield assert(state.count - initalState.count)(isGreaterThan(0.0))
}
} +
suite("sql") {
Expand Down