Skip to content

Commit ae356c5

Browse files
asmyasnikovasmyasnikov
authored
Merge pull request #1405 from ydb-platform/gstack
fix gstack codegen for function ID
2 parents 782946e + ab55f27 commit ae356c5

File tree

33 files changed

+120
-120
lines changed

33 files changed

+120
-120
lines changed

‎driver.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (d *Driver) trace() *trace.Driver {
115115
//nolint:nonamedreturns
116116
func (d *Driver) Close(ctx context.Context) (finalErr error) {
117117
onDone := trace.DriverOnClose(d.trace(), &ctx,
118-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.(*Driver).Close"),
118+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/ydb.(*Driver).Close"),
119119
)
120120
defer func() {
121121
onDone(finalErr)
@@ -254,7 +254,7 @@ func Open(ctx context.Context, dsn string, opts ...Option) (_ *Driver, _ error)
254254

255255
onDone := trace.DriverOnInit(
256256
d.trace(), &ctx,
257-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.Open"),
257+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/ydb.Open"),
258258
d.config.Endpoint(), d.config.Database(), d.config.Secure(),
259259
)
260260
defer func() {
@@ -292,7 +292,7 @@ func New(ctx context.Context, opts ...Option) (_ *Driver, err error) { //nolint:
292292

293293
onDone := trace.DriverOnInit(
294294
d.trace(), &ctx,
295-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.New"),
295+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/ydb.New"),
296296
d.config.Endpoint(), d.config.Database(), d.config.Secure(),
297297
)
298298
defer func() {

‎internal/balancer/balancer.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (b *Balancer) clusterDiscoveryAttempt(ctx context.Context) (err error) {
8888
onDone = trace.DriverOnBalancerClusterDiscoveryAttempt(
8989
b.driverConfig.Trace(), &ctx,
9090
stack.FunctionID(
91-
"github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).clusterDiscoveryAttempt"),
91+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer.(*Balancer).clusterDiscoveryAttempt"),
9292
address,
9393
)
9494
endpoints []endpoint.Endpoint
@@ -128,7 +128,7 @@ func (b *Balancer) applyDiscoveredEndpoints(ctx context.Context, newest []endpoi
128128
onDone = trace.DriverOnBalancerUpdate(
129129
b.driverConfig.Trace(), &ctx,
130130
stack.FunctionID(
131-
"github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).applyDiscoveredEndpoints"),
131+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer.(*Balancer).applyDiscoveredEndpoints"),
132132
b.config.DetectLocalDC,
133133
)
134134
previous = b.connections().All()
@@ -171,7 +171,7 @@ func (b *Balancer) applyDiscoveredEndpoints(ctx context.Context, newest []endpoi
171171
func (b *Balancer) Close(ctx context.Context) (err error) {
172172
onDone := trace.DriverOnBalancerClose(
173173
b.driverConfig.Trace(), &ctx,
174-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).Close"),
174+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer.(*Balancer).Close"),
175175
)
176176
defer func() {
177177
onDone(err)
@@ -197,7 +197,7 @@ func New(
197197
var (
198198
onDone = trace.DriverOnBalancerInit(
199199
driverConfig.Trace(), &ctx,
200-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.New"),
200+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer.New"),
201201
driverConfig.Balancer().String(),
202202
)
203203
discoveryConfig = discoveryConfig.New(append(opts,
@@ -326,7 +326,7 @@ func (b *Balancer) connections() *connectionsState {
326326
func (b *Balancer) getConn(ctx context.Context) (c conn.Conn, err error) {
327327
onDone := trace.DriverOnBalancerChooseEndpoint(
328328
b.driverConfig.Trace(), &ctx,
329-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).getConn"),
329+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer.(*Balancer).getConn"),
330330
)
331331
defer func() {
332332
if err == nil {

‎internal/cmd/gstack/utils/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func WriteFile(filename string, formatted []byte, perm fs.FileMode) error {
7676
}
7777

7878
func makeCall(fset *token.FileSet, path string, arg FunctionIDArg) (string, error) {
79-
basePath := filepath.Join("github.com", "ydb-platform", version.Prefix, version.Major, "")
79+
basePath := filepath.Join("github.com", "ydb-platform", version.Package, "v"+version.Major, "")
8080
packageName, err := getPackageName(fset, arg)
8181
if err != nil {
8282
return "", err

‎internal/conn/conn.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (c *conn) NodeID() uint32 {
107107
func (c *conn) park(ctx context.Context) (err error) {
108108
onDone := trace.DriverOnConnPark(
109109
c.config.Trace(), &ctx,
110-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).park"),
110+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*conn).park"),
111111
c.Endpoint(),
112112
)
113113
defer func() {
@@ -150,7 +150,7 @@ func (c *conn) setState(ctx context.Context, s State) State {
150150
if state := State(c.state.Swap(uint32(s))); state != s {
151151
trace.DriverOnConnStateChange(
152152
c.config.Trace(), &ctx,
153-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).setState"),
153+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*conn).setState"),
154154
c.endpoint.Copy(), state,
155155
)(s)
156156
}
@@ -198,7 +198,7 @@ func (c *conn) realConn(ctx context.Context) (cc *grpc.ClientConn, err error) {
198198

199199
onDone := trace.DriverOnConnDial(
200200
c.config.Trace(), &ctx,
201-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).realConn"),
201+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*conn).realConn"),
202202
c.endpoint.Copy(),
203203
)
204204
defer func() {
@@ -283,7 +283,7 @@ func (c *conn) Close(ctx context.Context) (err error) {
283283

284284
onDone := trace.DriverOnConnClose(
285285
c.config.Trace(), &ctx,
286-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).Close"),
286+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*conn).Close"),
287287
c.Endpoint(),
288288
)
289289
defer func() {
@@ -434,7 +434,7 @@ func (c *conn) Invoke(
434434
issues []trace.Issue
435435
onDone = trace.DriverOnConnInvoke(
436436
c.config.Trace(), &ctx,
437-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).Invoke"),
437+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*conn).Invoke"),
438438
c.endpoint, trace.Method(method),
439439
)
440440
cc *grpc.ClientConn
@@ -478,7 +478,7 @@ func (c *conn) NewStream(
478478
var (
479479
onDone = trace.DriverOnConnNewStream(
480480
c.config.Trace(), &ctx,
481-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).NewStream"),
481+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*conn).NewStream"),
482482
c.endpoint.Copy(), trace.Method(method),
483483
)
484484
useWrapping = UseWrapping(ctx)

‎internal/conn/grpc_client_stream.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (s *grpcClientStream) CloseSend() (err error) {
4141
var (
4242
ctx = s.streamCtx
4343
onDone = trace.DriverOnConnStreamCloseSend(s.parentConn.config.Trace(), &ctx,
44-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).CloseSend"),
44+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*grpcClientStream).CloseSend"),
4545
)
4646
)
4747
defer func() {
@@ -77,7 +77,7 @@ func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
7777
var (
7878
ctx = s.streamCtx
7979
onDone = trace.DriverOnConnStreamSendMsg(s.parentConn.config.Trace(), &ctx,
80-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).SendMsg"),
80+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*grpcClientStream).SendMsg"),
8181
)
8282
)
8383
defer func() {
@@ -122,15 +122,15 @@ func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
122122
func (s *grpcClientStream) finish(err error) {
123123
s.streamCancel()
124124
trace.DriverOnConnStreamFinish(s.parentConn.config.Trace(), s.streamCtx,
125-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).finish"), err,
125+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*grpcClientStream).finish"), err,
126126
)
127127
}
128128

129129
func (s *grpcClientStream) RecvMsg(m interface{}) (err error) { //nolint:funlen
130130
var (
131131
ctx = s.streamCtx
132132
onDone = trace.DriverOnConnStreamRecvMsg(s.parentConn.config.Trace(), &ctx,
133-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).RecvMsg"),
133+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*grpcClientStream).RecvMsg"),
134134
)
135135
)
136136
defer func() {

‎internal/conn/pool.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (p *Pool) Ban(ctx context.Context, cc Conn, cause error) {
114114

115115
trace.DriverOnConnBan(
116116
p.config.Trace(), &ctx,
117-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Ban"),
117+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*Pool).Ban"),
118118
e, cc.GetState(), cause,
119119
)(cc.SetState(ctx, Banned))
120120
}
@@ -136,7 +136,7 @@ func (p *Pool) Allow(ctx context.Context, cc Conn) {
136136

137137
trace.DriverOnConnAllow(
138138
p.config.Trace(), &ctx,
139-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Allow"),
139+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*Pool).Allow"),
140140
e, cc.GetState(),
141141
)(cc.Unban(ctx))
142142
}
@@ -149,7 +149,7 @@ func (p *Pool) Take(context.Context) error {
149149

150150
func (p *Pool) Release(ctx context.Context) (finalErr error) {
151151
onDone := trace.DriverOnPoolRelease(p.config.Trace(), &ctx,
152-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Release"),
152+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*Pool).Release"),
153153
)
154154
defer func() {
155155
onDone(finalErr)
@@ -233,7 +233,7 @@ func (p *Pool) collectConns() []*conn {
233233

234234
func NewPool(ctx context.Context, config Config) *Pool {
235235
onDone := trace.DriverOnPoolNew(config.Trace(), &ctx,
236-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.NewPool"),
236+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.NewPool"),
237237
)
238238
defer onDone()
239239

‎internal/coordination/client.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type Client struct {
3636

3737
func New(ctx context.Context, cc grpc.ClientConnInterface, config config.Config) *Client {
3838
onDone := trace.CoordinationOnNew(config.Trace(), &ctx,
39-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/coordination.New"),
39+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination.New"),
4040
)
4141
defer onDone()
4242

@@ -97,7 +97,7 @@ func (c *Client) CreateNode(ctx context.Context, path string, config coordinatio
9797
}
9898

9999
onDone := trace.CoordinationOnCreateNode(c.config.Trace(), &ctx,
100-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/coordination.(*Client).CreateNode"),
100+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination.(*Client).CreateNode"),
101101
path,
102102
)
103103
defer func() {
@@ -127,7 +127,7 @@ func (c *Client) AlterNode(ctx context.Context, path string, config coordination
127127
}
128128

129129
onDone := trace.CoordinationOnAlterNode(c.config.Trace(), &ctx,
130-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/coordination.(*Client).AlterNode"),
130+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination.(*Client).AlterNode"),
131131
path,
132132
)
133133
defer func() {
@@ -188,7 +188,7 @@ func (c *Client) DropNode(ctx context.Context, path string) (finalErr error) {
188188
}
189189

190190
onDone := trace.CoordinationOnDropNode(c.config.Trace(), &ctx,
191-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/coordination.(*Client).DropNode"),
191+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination.(*Client).DropNode"),
192192
path,
193193
)
194194
defer func() {
@@ -246,7 +246,7 @@ func (c *Client) DescribeNode(
246246
}
247247

248248
onDone := trace.CoordinationOnDescribeNode(c.config.Trace(), &ctx,
249-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/coordination.(*Client).DescribeNode"),
249+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination.(*Client).DescribeNode"),
250250
path,
251251
)
252252
defer func() {
@@ -378,7 +378,7 @@ func (c *Client) Session(
378378
}
379379

380380
onDone := trace.CoordinationOnSession(c.config.Trace(), &ctx,
381-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/coordination.(*Client).Session"),
381+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination.(*Client).Session"),
382382
path,
383383
)
384384
defer func() {
@@ -394,7 +394,7 @@ func (c *Client) Close(ctx context.Context) (finalErr error) {
394394
}
395395

396396
onDone := trace.CoordinationOnClose(c.config.Trace(), &ctx,
397-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/coordination.(*Client).Close"),
397+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination.(*Client).Close"),
398398
)
399399
defer func() {
400400
onDone(finalErr)

‎internal/discovery/discovery.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (c *Client) Discover(ctx context.Context) (endpoints []endpoint.Endpoint, f
9393
var (
9494
onDone = trace.DiscoveryOnDiscover(
9595
c.config.Trace(), &ctx,
96-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/discovery.(*Client).Discover"),
96+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery.(*Client).Discover"),
9797
c.config.Endpoint(), c.config.Database(),
9898
)
9999
location string
@@ -122,7 +122,7 @@ func (c *Client) Discover(ctx context.Context) (endpoints []endpoint.Endpoint, f
122122
func (c *Client) WhoAmI(ctx context.Context) (whoAmI *discovery.WhoAmI, err error) {
123123
var (
124124
onDone = trace.DiscoveryOnWhoAmI(c.config.Trace(), &ctx,
125-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/discovery.(*Client).WhoAmI"),
125+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery.(*Client).WhoAmI"),
126126
)
127127
request = Ydb_Discovery.WhoAmIRequest{}
128128
response *Ydb_Discovery.WhoAmIResponse

‎internal/meta/meta.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func (m *Meta) meta(ctx context.Context) (_ metadata.MD, err error) {
118118
var token string
119119

120120
done := trace.DriverOnGetCredentials(m.trace, &ctx,
121-
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/meta.(*Meta).meta"),
121+
stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/meta.(*Meta).meta"),
122122
)
123123
defer func() {
124124
done(token, err)

‎internal/pool/pool.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func New[PT Item[T], T any](
160160

161161
onDone := p.trace.OnNew(&NewStartInfo{
162162
Context: &ctx,
163-
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.New"),
163+
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/pool.New"),
164164
})
165165

166166
defer func() {
@@ -282,7 +282,7 @@ func (p *Pool[PT, T]) Stats() Stats {
282282
func (p *Pool[PT, T]) getItem(ctx context.Context) (_ PT, finalErr error) {
283283
onDone := p.trace.OnGet(&GetStartInfo{
284284
Context: &ctx,
285-
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).getItem"),
285+
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/pool.(*Pool).getItem"),
286286
})
287287
defer func() {
288288
onDone(&GetDoneInfo{
@@ -342,7 +342,7 @@ func (p *Pool[PT, T]) getItem(ctx context.Context) (_ PT, finalErr error) {
342342
func (p *Pool[PT, T]) putItem(ctx context.Context, item PT) (finalErr error) {
343343
onDone := p.trace.OnPut(&PutStartInfo{
344344
Context: &ctx,
345-
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).putItem"),
345+
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/pool.(*Pool).putItem"),
346346
})
347347
defer func() {
348348
onDone(&PutDoneInfo{
@@ -395,7 +395,7 @@ func (p *Pool[PT, T]) closeItem(ctx context.Context, item PT) error {
395395
func (p *Pool[PT, T]) try(ctx context.Context, f func(ctx context.Context, item PT) error) (finalErr error) {
396396
onDone := p.trace.OnTry(&TryStartInfo{
397397
Context: &ctx,
398-
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).try"),
398+
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/pool.(*Pool).try"),
399399
})
400400
defer func() {
401401
onDone(&TryDoneInfo{
@@ -435,7 +435,7 @@ func (p *Pool[PT, T]) With(
435435
var (
436436
onDone = p.trace.OnWith(&WithStartInfo{
437437
Context: &ctx,
438-
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).With"),
438+
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/pool.(*Pool).With"),
439439
})
440440
attempts int
441441
)
@@ -470,7 +470,7 @@ func (p *Pool[PT, T]) With(
470470
func (p *Pool[PT, T]) Close(ctx context.Context) (finalErr error) {
471471
onDone := p.trace.OnClose(&CloseStartInfo{
472472
Context: &ctx,
473-
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).Close"),
473+
Call: stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/pool.(*Pool).Close"),
474474
})
475475
defer func() {
476476
onDone(&CloseDoneInfo{

0 commit comments

Comments
 (0)