Merge pull request #755 from ydb-platform/connected

improve connected event

Author: asmyasnikov

CHANGELOG.md

@@ -1,4 +1,5 @@
 * Improved code with `go-critic` linter
+* Added session info into `database/sql` event `connected`
 
 ## v3.47.3
 * Added `table/options.Description.Tiering` field

internal/xsql/connector.go

@@ -286,19 +286,22 @@ func (c *Connector) detach(cc *conn) {
 }
 
 func (c *Connector) Connect(ctx context.Context) (_ driver.Conn, err error) {
-	onDone := trace.DatabaseSQLOnConnectorConnect(c.trace, &ctx)
+	var (
+		onDone  = trace.DatabaseSQLOnConnectorConnect(c.trace, &ctx)
+		session table.ClosableSession
+	)
 	defer func() {
-		onDone(err)
+		onDone(err, session)
 	}()
 	if !c.disableServerBalancer {
 		ctx = meta.WithAllowFeatures(ctx, metaHeaders.HintSessionBalancer)
 	}
-	s, err := c.parent.Table().CreateSession(ctx) //nolint
+	session, err = c.parent.Table().CreateSession(ctx) //nolint
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
 	}
 
-	return newConn(c, s, withDefaultTxControl(c.defaultTxControl),
+	return newConn(c, session, withDefaultTxControl(c.defaultTxControl),
 		withDefaultQueryMode(c.defaultQueryMode),
 		withDataOpts(c.defaultDataQueryOpts...),
 		withScanOpts(c.defaultScanQueryOpts...),

log/sql.go

@@ -27,8 +27,10 @@ func internalDatabaseSQL(l *wrapper, d trace.Detailer) (t trace.DatabaseSQL) {
 		start := time.Now()
 		return func(info trace.DatabaseSQLConnectorConnectDoneInfo) {
 			if info.Error == nil {
-				l.Log(WithLevel(ctx, INFO), "connected",
+				l.Log(WithLevel(ctx, DEBUG), "connected",
 					latency(start),
+					String("session_id", info.Session.ID()),
+					String("session_status", info.Session.Status()),
 				)
 			} else {
 				l.Log(WithLevel(ctx, ERROR), "failed",

table/table.go

@@ -3,6 +3,7 @@ package table
 import (
 	"context"
 	"sort"
+	"time"
 
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Table"
@@ -81,6 +82,7 @@ const (
 type SessionInfo interface {
 	ID() string
 	Status() SessionStatus
+	LastUsage() time.Time
 }
 
 type Session interface {

trace/sql.go

@@ -40,7 +40,8 @@ type (
 		Context *context.Context
 	}
 	DatabaseSQLConnectorConnectDoneInfo struct {
-		Error error
+		Error   error
+		Session tableSessionInfo
 	}
 	DatabaseSQLConnPingStartInfo struct {
 		// Context make available context in trace callback function.