driver close traces

driver.go

@@ -94,7 +94,12 @@ type Driver struct { //nolint:maligned
 }
 
 // Close closes Driver and clear resources
-func (d *Driver) Close(ctx context.Context) error {
+func (d *Driver) Close(ctx context.Context) (finalErr error) {
+	onDone := trace.DriverOnClose(d.config.Trace(), &ctx, stack.FunctionID(0))
+	defer func() {
+		onDone(finalErr)
+	}()
+
 	d.mtx.Lock()
 	defer d.mtx.Unlock()
 
@@ -104,16 +109,16 @@ func (d *Driver) Close(ctx context.Context) error {
 		}
 	}()
 
-	closers := make([]func(context.Context) error, 0)
+	closes := make([]func(context.Context) error, 0)
 	d.childrenMtx.WithLock(func() {
 		for _, child := range d.children {
-			closers = append(closers, child.Close)
+			closes = append(closes, child.Close)
 		}
 		d.children = nil
 	})
 
-	closers = append(
-		closers,
+	closes = append(
+		closes,
 		d.ratelimiter.Close,
 		d.coordination.Close,
 		d.scheme.Close,
@@ -125,8 +130,8 @@ func (d *Driver) Close(ctx context.Context) error {
 	)
 
 	var issues []error
-	for _, closer := range closers {
-		if err := closer(ctx); err != nil {
+	for _, f := range closes {
+		if err := f(ctx); err != nil {
 			issues = append(issues, err)
 		}
 	}
@@ -310,7 +315,7 @@ func connect(ctx context.Context, d *Driver) error {
 	}
 
 	if d.pool == nil {
-		d.pool = conn.NewPool(d.config)
+		d.pool = conn.NewPool(ctx, d.config)
 	}
 
 	d.balancer, err = balancer.New(ctx, d.config, d.pool, d.discoveryOptions...)

internal/balancer/local_dc_test.go

@@ -136,7 +136,7 @@ func TestLocalDCDiscovery(t *testing.T) {
 	r := &Balancer{
 		driverConfig:   cfg,
 		balancerConfig: *cfg.Balancer(),
-		pool:           conn.NewPool(cfg),
+		pool:           conn.NewPool(context.Background(), cfg),
 		discoveryClient: discoveryMock{endpoints: []endpoint.Endpoint{
 			&mock.Endpoint{AddrField: "a:123", LocationField: "a"},
 			&mock.Endpoint{AddrField: "b:234", LocationField: "b"},

internal/conn/pool.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/closer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
@@ -118,7 +119,12 @@ func (p *Pool) Take(context.Context) error {
 	return nil
 }
 
-func (p *Pool) Release(ctx context.Context) error {
+func (p *Pool) Release(ctx context.Context) (finalErr error) {
+	onDone := trace.DriverOnPoolRelease(p.config.Trace(), &ctx, stack.FunctionID(0))
+	defer func() {
+		onDone(finalErr)
+	}()
+
 	if atomic.AddInt64(&p.usages, -1) > 0 {
 		return nil
 	}
@@ -162,7 +168,7 @@ func (p *Pool) Release(ctx context.Context) error {
 	return nil
 }
 
-func (p *Pool) connParker(ttl, interval time.Duration) {
+func (p *Pool) connParker(ctx context.Context, ttl, interval time.Duration) {
 	ticker := time.NewTicker(interval)
 	defer ticker.Stop()
 	for {
@@ -174,7 +180,7 @@ func (p *Pool) connParker(ttl, interval time.Duration) {
 				if time.Since(c.LastUsage()) > ttl {
 					switch c.GetState() {
 					case Online, Banned:
-						_ = c.park(context.Background())
+						_ = c.park(ctx)
 					default:
 						// nop
 					}
@@ -194,7 +200,11 @@ func (p *Pool) collectConns() []*conn {
 	return conns
 }
 
-func NewPool(config Config) *Pool {
+func NewPool(ctx context.Context, config Config) *Pool {
+	onDone := trace.DriverOnPoolNew(config.Trace(), &ctx, stack.FunctionID(0))
+	defer func() {
+		onDone()
+	}()
 	p := &Pool{
 		usages: 1,
 		config: config,
@@ -203,7 +213,7 @@ func NewPool(config Config) *Pool {
 		done:   make(chan struct{}),
 	}
 	if ttl := config.ConnectionTTL(); ttl > 0 {
-		go p.connParker(ttl, ttl/2)
+		go p.connParker(xcontext.WithoutDeadline(ctx), ttl, ttl/2)
 	}
 	return p
 }

trace/driver.go

@@ -19,6 +19,10 @@ type (
 		OnInit  func(DriverInitStartInfo) func(DriverInitDoneInfo)
 		OnClose func(DriverCloseStartInfo) func(DriverCloseDoneInfo)
 
+		// Pool of connections
+		OnPoolNew     func(DriverConnPoolNewStartInfo) func(DriverConnPoolNewDoneInfo)
+		OnPoolRelease func(DriverConnPoolReleaseStartInfo) func(DriverConnPoolReleaseDoneInfo)
+
 		// Deprecated: driver not notificate about this event
 		OnNetRead func(DriverNetReadStartInfo) func(DriverNetReadDoneInfo)
 		// Deprecated: driver not notificate about this event
@@ -409,6 +413,27 @@ type (
 	DriverInitDoneInfo struct {
 		Error error
 	}
+	DriverConnPoolNewStartInfo struct {
+		// Context make available context in trace callback function.
+		// Pointer to context provide replacement of context in trace callback function.
+		// Warning: concurrent access to pointer on client side must be excluded.
+		// Safe replacement of context are provided only inside callback function
+		Context *context.Context
+		Call    call
+	}
+	DriverConnPoolNewDoneInfo struct {
+	}
+	DriverConnPoolReleaseStartInfo struct {
+		// Context make available context in trace callback function.
+		// Pointer to context provide replacement of context in trace callback function.
+		// Warning: concurrent access to pointer on client side must be excluded.
+		// Safe replacement of context are provided only inside callback function
+		Context *context.Context
+		Call    call
+	}
+	DriverConnPoolReleaseDoneInfo struct {
+		Error error
+	}
 	DriverCloseStartInfo struct {
 		// Context make available context in trace callback function.
 		// Pointer to context provide replacement of context in trace callback function.

with_test.go

@@ -132,7 +132,7 @@ func TestWithCertificatesCached(t *testing.T) {
 			db, err := newConnectionFromOptions(ctx,
 				append(
 					test.options,
-					withConnPool(conn.NewPool(config.New())),
+					withConnPool(conn.NewPool(context.Background(), config.New())),
 				)...,
 			)
 			require.NoError(t, err)