Skip to content

Commit 29a65aa

Browse files
author
anatoly32322
committed
Fix lll
1 parent 32bee0b commit 29a65aa

File tree

19 files changed

+73
-36
lines changed

19 files changed

+73
-36
lines changed

driver.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ func (d *Driver) trace() *trace.Driver {
115115
//
116116
//nolint:nonamedreturns
117117
func (d *Driver) Close(ctx context.Context) (finalErr error) {
118-
onDone := trace.DriverOnClose(d.trace(), &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.(*Driver).Close"))
118+
onDone := trace.DriverOnClose(d.trace(), &ctx,
119+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.(*Driver).Close"))
119120
defer func() {
120121
onDone(finalErr)
121122
}()

internal/balancer/balancer.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ func (b *Balancer) clusterDiscoveryAttempt(ctx context.Context) (err error) {
9797
address = "ydb:///" + b.driverConfig.Endpoint()
9898
onDone = trace.DriverOnBalancerClusterDiscoveryAttempt(
9999
b.driverConfig.Trace(), &ctx,
100-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).clusterDiscoveryAttempt"),
100+
stack.FunctionID(
101+
"github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).clusterDiscoveryAttempt"),
101102
address,
102103
)
103104
endpoints []endpoint.Endpoint
@@ -173,7 +174,8 @@ func (b *Balancer) applyDiscoveredEndpoints(ctx context.Context, endpoints []end
173174
var (
174175
onDone = trace.DriverOnBalancerUpdate(
175176
b.driverConfig.Trace(), &ctx,
176-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).applyDiscoveredEndpoints"),
177+
stack.FunctionID(
178+
"github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).applyDiscoveredEndpoints"),
177179
b.config.DetectLocalDC,
178180
)
179181
previousConns []conn.Conn

internal/cmd/gstack/utils/utils.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ package utils
22

33
import (
44
"fmt"
5-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/version"
65
"go/ast"
76
"go/parser"
87
"go/token"
98
"io"
109
"io/fs"
1110
"os"
1211
"path/filepath"
12+
13+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/version"
1314
)
1415

1516
type FunctionIDArg struct {

internal/conn/grpc_client_stream.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ type grpcClientStream struct {
2525
}
2626

2727
func (s *grpcClientStream) CloseSend() (err error) {
28-
onDone := trace.DriverOnConnStreamCloseSend(s.c.config.Trace(), &s.ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).CloseSend"))
28+
onDone := trace.DriverOnConnStreamCloseSend(s.c.config.Trace(), &s.ctx,
29+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).CloseSend"))
2930
defer func() {
3031
onDone(err)
3132
}()
@@ -56,7 +57,8 @@ func (s *grpcClientStream) CloseSend() (err error) {
5657
}
5758

5859
func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
59-
onDone := trace.DriverOnConnStreamSendMsg(s.c.config.Trace(), &s.ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).SendMsg"))
60+
onDone := trace.DriverOnConnStreamSendMsg(s.c.config.Trace(), &s.ctx,
61+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).SendMsg"))
6062
defer func() {
6163
onDone(err)
6264
}()
@@ -95,7 +97,8 @@ func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
9597
}
9698

9799
func (s *grpcClientStream) RecvMsg(m interface{}) (err error) {
98-
onDone := trace.DriverOnConnStreamRecvMsg(s.c.config.Trace(), &s.ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).RecvMsg"))
100+
onDone := trace.DriverOnConnStreamRecvMsg(s.c.config.Trace(), &s.ctx,
101+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).RecvMsg"))
99102
defer func() {
100103
onDone(err)
101104
}()

internal/conn/pool.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ func (p *Pool) Take(context.Context) error {
148148
}
149149

150150
func (p *Pool) Release(ctx context.Context) (finalErr error) {
151-
onDone := trace.DriverOnPoolRelease(p.config.Trace(), &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Release"))
151+
onDone := trace.DriverOnPoolRelease(p.config.Trace(), &ctx,
152+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Release"))
152153
defer func() {
153154
onDone(finalErr)
154155
}()
@@ -230,7 +231,8 @@ func (p *Pool) collectConns() []*conn {
230231
}
231232

232233
func NewPool(ctx context.Context, config Config) *Pool {
233-
onDone := trace.DriverOnPoolNew(config.Trace(), &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.NewPool"))
234+
onDone := trace.DriverOnPoolNew(config.Trace(), &ctx,
235+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.NewPool"))
234236
defer onDone()
235237

236238
p := &Pool{

internal/discovery/discovery.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ func (c *Client) Discover(ctx context.Context) (endpoints []endpoint.Endpoint, e
9999

100100
func (c *Client) WhoAmI(ctx context.Context) (whoAmI *discovery.WhoAmI, err error) {
101101
var (
102-
onDone = trace.DiscoveryOnWhoAmI(c.config.Trace(), &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/discovery.(*Client).WhoAmI"))
102+
onDone = trace.DiscoveryOnWhoAmI(c.config.Trace(), &ctx,
103+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/discovery.(*Client).WhoAmI"))
103104
request = Ydb_Discovery.WhoAmIRequest{}
104105
response *Ydb_Discovery.WhoAmIResponse
105106
whoAmIResultResult Ydb_Discovery.WhoAmIResult

internal/meta/meta.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ func (m *Meta) meta(ctx context.Context) (_ metadata.MD, err error) {
115115

116116
var token string
117117

118-
done := trace.DriverOnGetCredentials(m.trace, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/meta.(*Meta).meta"))
118+
done := trace.DriverOnGetCredentials(m.trace, &ctx,
119+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/meta.(*Meta).meta"))
119120
defer func() {
120121
done(token, err)
121122
}()

internal/query/client.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ func (c *Client) DoTx(ctx context.Context, op query.TxOperation, opts ...options
163163
}
164164

165165
func New(ctx context.Context, balancer balancer, cfg *config.Config) *Client {
166-
onDone := trace.QueryOnNew(cfg.Trace(), &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.New"))
166+
onDone := trace.QueryOnNew(cfg.Trace(), &ctx,
167+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.New"))
167168
defer onDone()
168169

169170
client := &Client{

internal/query/result.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ func newResult(
4040
closeResult = func() {}
4141
}
4242

43-
onDone := trace.QueryOnResultNew(t, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.newResult"))
43+
onDone := trace.QueryOnResultNew(t, &ctx,
44+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.newResult"))
4445
defer func() {
4546
onDone(err)
4647
}()
@@ -86,7 +87,8 @@ func nextPart(
8687
t = &trace.Query{}
8788
}
8889

89-
onDone := trace.QueryOnResultNextPart(t, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.nextPart"))
90+
onDone := trace.QueryOnResultNextPart(t, &ctx,
91+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.nextPart"))
9092
defer func() {
9193
onDone(finalErr)
9294
}()
@@ -100,7 +102,8 @@ func nextPart(
100102
}
101103

102104
func (r *result) Close(ctx context.Context) (err error) {
103-
onDone := trace.QueryOnResultClose(r.trace, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).Close"))
105+
onDone := trace.QueryOnResultClose(r.trace, &ctx,
106+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).Close"))
104107
defer func() {
105108
onDone(err)
106109
}()
@@ -176,7 +179,8 @@ func (r *result) nextResultSet(ctx context.Context) (_ *resultSet, err error) {
176179
}
177180

178181
func (r *result) NextResultSet(ctx context.Context) (_ query.ResultSet, err error) {
179-
onDone := trace.QueryOnResultNextResultSet(r.trace, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).NextResultSet"))
182+
onDone := trace.QueryOnResultNextResultSet(r.trace, &ctx,
183+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).NextResultSet"))
180184
defer func() {
181185
onDone(err)
182186
}()

internal/query/result_set.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ func (rs *resultSet) nextRow(ctx context.Context) (*row, error) {
8585
}
8686

8787
func (rs *resultSet) NextRow(ctx context.Context) (_ query.Row, err error) {
88-
onDone := trace.QueryOnResultSetNextRow(rs.trace, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*resultSet).NextRow"))
88+
onDone := trace.QueryOnResultSetNextRow(rs.trace, &ctx,
89+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*resultSet).NextRow"))
8990
defer func() {
9091
onDone(err)
9192
}()

0 commit comments

Comments
 (0)