Merge pull request #1157 from ydb-platform/style-fix

asmyasnikov · web-flow · commit ee906a312b5c · 2024-03-24T20:12:56.000+03:00
Style fix
diff --git a/driver.go b/driver.go
@@ -116,7 +116,8 @@ func (d *Driver) trace() *trace.Driver {
 //nolint:nonamedreturns
 func (d *Driver) Close(ctx context.Context) (finalErr error) {
 	onDone := trace.DriverOnClose(d.trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.(*Driver).Close"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.(*Driver).Close"),
+	)
 	defer func() {
 		onDone(finalErr)
 	}()
diff --git a/internal/conn/grpc_client_stream.go b/internal/conn/grpc_client_stream.go
@@ -26,7 +26,8 @@ type grpcClientStream struct {
 
 func (s *grpcClientStream) CloseSend() (err error) {
 	onDone := trace.DriverOnConnStreamCloseSend(s.c.config.Trace(), &s.ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).CloseSend"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).CloseSend"),
+	)
 	defer func() {
 		onDone(err)
 	}()
@@ -58,7 +59,8 @@ func (s *grpcClientStream) CloseSend() (err error) {
 
 func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
 	onDone := trace.DriverOnConnStreamSendMsg(s.c.config.Trace(), &s.ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).SendMsg"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).SendMsg"),
+	)
 	defer func() {
 		onDone(err)
 	}()
@@ -98,7 +100,8 @@ func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
 
 func (s *grpcClientStream) RecvMsg(m interface{}) (err error) {
 	onDone := trace.DriverOnConnStreamRecvMsg(s.c.config.Trace(), &s.ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).RecvMsg"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).RecvMsg"),
+	)
 	defer func() {
 		onDone(err)
 	}()
diff --git a/internal/conn/pool.go b/internal/conn/pool.go
@@ -149,7 +149,8 @@ func (p *Pool) Take(context.Context) error {
 
 func (p *Pool) Release(ctx context.Context) (finalErr error) {
 	onDone := trace.DriverOnPoolRelease(p.config.Trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Release"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Release"),
+	)
 	defer func() {
 		onDone(finalErr)
 	}()
@@ -232,7 +233,8 @@ func (p *Pool) collectConns() []*conn {
 
 func NewPool(ctx context.Context, config Config) *Pool {
 	onDone := trace.DriverOnPoolNew(config.Trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.NewPool"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.NewPool"),
+	)
 	defer onDone()
 
 	p := &Pool{
diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go
@@ -100,7 +100,8 @@ func (c *Client) Discover(ctx context.Context) (endpoints []endpoint.Endpoint, e
 func (c *Client) WhoAmI(ctx context.Context) (whoAmI *discovery.WhoAmI, err error) {
 	var (
 		onDone = trace.DiscoveryOnWhoAmI(c.config.Trace(), &ctx,
-			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/discovery.(*Client).WhoAmI"))
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/discovery.(*Client).WhoAmI"),
+		)
 		request            = Ydb_Discovery.WhoAmIRequest{}
 		response           *Ydb_Discovery.WhoAmIResponse
 		whoAmIResultResult Ydb_Discovery.WhoAmIResult
diff --git a/internal/meta/meta.go b/internal/meta/meta.go
@@ -118,7 +118,8 @@ func (m *Meta) meta(ctx context.Context) (_ metadata.MD, err error) {
 	var token string
 
 	done := trace.DriverOnGetCredentials(m.trace, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/meta.(*Meta).meta"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/meta.(*Meta).meta"),
+	)
 	defer func() {
 		done(token, err)
 	}()
diff --git a/internal/query/client.go b/internal/query/client.go
@@ -94,14 +94,22 @@ func do(
 	return attempts, nil
 }
 
-func (c *Client) Do(ctx context.Context, op query.Operation, opts ...options.DoOption) error {
+func (c *Client) Do(ctx context.Context, op query.Operation, opts ...options.DoOption) (err error) {
+	var (
+		onDone = trace.QueryOnDo(c.config.Trace(), &ctx,
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*Client).Do"),
+		)
+		attempts int
+	)
+	defer func() {
+		onDone(attempts, err)
+	}()
+
 	select {
 	case <-c.done:
 		return xerrors.WithStackTrace(errClosedClient)
 	default:
-		onDone := trace.QueryOnDo(c.config.Trace(), &ctx, stack.FunctionID(""))
-		attempts, err := do(ctx, c.pool, op, c.config.Trace(), opts...)
-		onDone(attempts, err)
+		attempts, err = do(ctx, c.pool, op, c.config.Trace(), opts...)
 
 		return err
 	}
@@ -149,22 +157,31 @@ func doTx(
 	return attempts, nil
 }
 
-func (c *Client) DoTx(ctx context.Context, op query.TxOperation, opts ...options.DoTxOption) error {
+func (c *Client) DoTx(ctx context.Context, op query.TxOperation, opts ...options.DoTxOption) (err error) {
+	var (
+		onDone = trace.QueryOnDoTx(c.config.Trace(), &ctx,
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*Client).DoTx"),
+		)
+		attempts int
+	)
+	defer func() {
+		onDone(attempts, err)
+	}()
+
 	select {
 	case <-c.done:
 		return xerrors.WithStackTrace(errClosedClient)
 	default:
-		onDone := trace.QueryOnDoTx(c.config.Trace(), &ctx, stack.FunctionID(""))
-		attempts, err := doTx(ctx, c.pool, op, c.config.Trace(), opts...)
-		onDone(attempts, err)
+		attempts, err = doTx(ctx, c.pool, op, c.config.Trace(), opts...)
 
 		return err
 	}
 }
 
 func New(ctx context.Context, balancer balancer, cfg *config.Config) *Client {
 	onDone := trace.QueryOnNew(cfg.Trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.New"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.New"),
+	)
 	defer onDone()
 
 	client := &Client{
diff --git a/internal/query/result.go b/internal/query/result.go
@@ -41,7 +41,8 @@ func newResult(
 	}
 
 	onDone := trace.QueryOnResultNew(t, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.newResult"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.newResult"),
+	)
 	defer func() {
 		onDone(err)
 	}()
@@ -88,7 +89,8 @@ func nextPart(
 	}
 
 	onDone := trace.QueryOnResultNextPart(t, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.nextPart"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.nextPart"),
+	)
 	defer func() {
 		onDone(finalErr)
 	}()
@@ -103,7 +105,8 @@ func nextPart(
 
 func (r *result) Close(ctx context.Context) (err error) {
 	onDone := trace.QueryOnResultClose(r.trace, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).Close"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).Close"),
+	)
 	defer func() {
 		onDone(err)
 	}()
@@ -180,7 +183,8 @@ func (r *result) nextResultSet(ctx context.Context) (_ *resultSet, err error) {
 
 func (r *result) NextResultSet(ctx context.Context) (_ query.ResultSet, err error) {
 	onDone := trace.QueryOnResultNextResultSet(r.trace, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).NextResultSet"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).NextResultSet"),
+	)
 	defer func() {
 		onDone(err)
 	}()
diff --git a/internal/query/result_set.go b/internal/query/result_set.go
@@ -86,7 +86,8 @@ func (rs *resultSet) nextRow(ctx context.Context) (*row, error) {
 
 func (rs *resultSet) NextRow(ctx context.Context) (_ query.Row, err error) {
 	onDone := trace.QueryOnResultSetNextRow(rs.trace, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*resultSet).NextRow"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*resultSet).NextRow"),
+	)
 	defer func() {
 		onDone(err)
 	}()
diff --git a/internal/query/row.go b/internal/query/row.go
@@ -36,7 +36,8 @@ func newRow(ctx context.Context, columns []*Ydb.Column, v *Ydb.Value, t *trace.Q
 
 func (r row) Scan(dst ...interface{}) (err error) {
 	onDone := trace.QueryOnRowScan(r.trace, &r.ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.row.Scan"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.row.Scan"),
+	)
 	defer func() {
 		onDone(err)
 	}()
@@ -46,7 +47,8 @@ func (r row) Scan(dst ...interface{}) (err error) {
 
 func (r row) ScanNamed(dst ...scanner.NamedDestination) (err error) {
 	onDone := trace.QueryOnRowScanNamed(r.trace, &r.ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.row.ScanNamed"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.row.ScanNamed"),
+	)
 	defer func() {
 		onDone(err)
 	}()
@@ -56,7 +58,8 @@ func (r row) ScanNamed(dst ...scanner.NamedDestination) (err error) {
 
 func (r row) ScanStruct(dst interface{}, opts ...scanner.ScanStructOption) (err error) {
 	onDone := trace.QueryOnRowScanStruct(r.trace, &r.ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.row.ScanStruct"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.row.ScanStruct"),
+	)
 	defer func() {
 		onDone(err)
 	}()
diff --git a/internal/query/session.go b/internal/query/session.go
@@ -69,7 +69,8 @@ func createSession(
 	}
 
 	onDone := trace.QueryOnSessionCreate(s.cfg.Trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.createSession"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.createSession"),
+	)
 	defer func() {
 		onDone(s, finalErr)
 	}()
diff --git a/internal/scheme/client.go b/internal/scheme/client.go
@@ -125,7 +125,8 @@ func (c *Client) removeDirectory(ctx context.Context, path string) (err error) {
 
 func (c *Client) ListDirectory(ctx context.Context, path string) (d scheme.Directory, finalErr error) {
 	onDone := trace.SchemeOnListDirectory(c.config.Trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/scheme.(*Client).ListDirectory"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/scheme.(*Client).ListDirectory"),
+	)
 	defer func() {
 		onDone(finalErr)
 	}()
diff --git a/internal/scripting/client.go b/internal/scripting/client.go
@@ -293,7 +293,8 @@ func (c *Client) Close(ctx context.Context) (err error) {
 		return xerrors.WithStackTrace(errNilClient)
 	}
 	onDone := trace.ScriptingOnClose(c.config.Trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/scripting.(*Client).Close"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/scripting.(*Client).Close"),
+	)
 	defer func() {
 		onDone(err)
 	}()
diff --git a/internal/table/client.go b/internal/table/client.go
@@ -36,7 +36,8 @@ type balancer interface {
 
 func New(ctx context.Context, balancer balancer, config *config.Config) *Client {
 	onDone := trace.TableOnInit(config.Trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/table.New"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/table.New"),
+	)
 	defer func() {
 		onDone(config.SizeLimit())
 	}()
@@ -381,7 +382,8 @@ func (c *Client) internalPoolGet(ctx context.Context, opts ...getOption) (s *ses
 	}
 
 	onDone := trace.TableOnPoolGet(o.t, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/table.(*Client).internalPoolGet"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/table.(*Client).internalPoolGet"),
+	)
 	defer func() {
 		onDone(s, i, err)
 	}()
@@ -478,7 +480,8 @@ func (c *Client) internalPoolWaitFromCh(ctx context.Context, t *trace.Table) (s
 	})
 
 	waitDone := trace.TableOnPoolWait(t, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/table.(*Client).internalPoolWaitFromCh"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/table.(*Client).internalPoolWaitFromCh"),
+	)
 
 	defer func() {
 		waitDone(s, err)
@@ -591,6 +594,13 @@ func (c *Client) Close(ctx context.Context) (err error) {
 		return xerrors.WithStackTrace(errNilClient)
 	}
 
+	onDone := trace.TableOnClose(c.config.Trace(), &ctx,
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/table.(*Client).Close"),
+	)
+	defer func() {
+		onDone(err)
+	}()
+
 	c.mu.WithLock(func() {
 		select {
 		case <-c.done:
@@ -599,11 +609,6 @@ func (c *Client) Close(ctx context.Context) (err error) {
 		default:
 			close(c.done)
 
-			onDone := trace.TableOnClose(c.config.Trace(), &ctx, stack.FunctionID(""))
-			defer func() {
-				onDone(err)
-			}()
-
 			c.limit = 0
 
 			for el := c.waitQ.Front(); el != nil; el = el.Next() {
diff --git a/internal/table/session.go b/internal/table/session.go
@@ -117,7 +117,8 @@ func newSession(ctx context.Context, cc grpc.ClientConnInterface, config *config
 	s *session, err error,
 ) {
 	onDone := trace.TableOnSessionNew(config.Trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/table.newSession"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/table.newSession"),
+	)
 	defer func() {
 		onDone(s, err)
 	}()
diff --git a/internal/xsql/conn.go b/internal/xsql/conn.go
@@ -396,7 +396,8 @@ func (c *conn) queryContext(ctx context.Context, query string, args []driver.Nam
 
 func (c *conn) Ping(ctx context.Context) (finalErr error) {
 	onDone := trace.DatabaseSQLOnConnPing(c.trace, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/xsql.(*conn).Ping"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/xsql.(*conn).Ping"),
+	)
 	defer func() {
 		onDone(finalErr)
 	}()
@@ -459,7 +460,8 @@ func (c *conn) ID() string {
 func (c *conn) BeginTx(ctx context.Context, txOptions driver.TxOptions) (_ driver.Tx, finalErr error) {
 	var tx currentTx
 	onDone := trace.DatabaseSQLOnConnBegin(c.trace, &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/xsql.(*conn).BeginTx"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/xsql.(*conn).BeginTx"),
+	)
 	defer func() {
 		onDone(tx, finalErr)
 	}()
diff --git a/internal/xsql/stmt.go b/internal/xsql/stmt.go
@@ -73,7 +73,8 @@ func (s *stmt) NumInput() int {
 
 func (s *stmt) Close() (finalErr error) {
 	onDone := trace.DatabaseSQLOnStmtClose(s.trace, &s.stmtCtx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/xsql.(*stmt).Close"))
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/xsql.(*stmt).Close"),
+	)
 	defer func() {
 		onDone(finalErr)
 	}()

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ func createSession(`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`onDone := trace.QueryOnSessionCreate(s.cfg.Trace(), &ctx,`
`72`		`- stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.createSession"))`
	`72`	`+ stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.createSession"),`
	`73`	`+ )`
`73`	`74`	`defer func() {`
`74`	`75`	`onDone(s, finalErr)`
`75`	`76`	`}()`