Add call info instead of ""

ydb-platform · Mar 23, 2024 · 88ccf0b · 88ccf0b
1 parent a2e40f0
commit 88ccf0b
Show file tree

Hide file tree

Showing 32 changed files with 180 additions and 138 deletions.
diff --git a/driver.go b/driver.go
@@ -115,7 +115,7 @@ 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(""))
+	onDone := trace.DriverOnClose(d.trace(), &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.(*Driver).Close"))
 	defer func() {
 		onDone(finalErr)
 	}()
@@ -248,7 +248,7 @@ func Open(ctx context.Context, dsn string, opts ...Option) (_ *Driver, err error
 
 	onDone := trace.DriverOnInit(
 		d.trace(), &ctx,
-		stack.FunctionID(""),
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.Open"),
 		d.config.Endpoint(), d.config.Database(), d.config.Secure(),
 	)
 	defer func() {
@@ -284,7 +284,7 @@ func New(ctx context.Context, opts ...Option) (_ *Driver, err error) {
 
 	onDone := trace.DriverOnInit(
 		d.trace(), &ctx,
-		stack.FunctionID(""),
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/ydb.New"),
 		d.config.Endpoint(), d.config.Database(), d.config.Secure(),
 	)
 	defer func() {

diff --git a/internal/balancer/balancer.go b/internal/balancer/balancer.go
@@ -97,7 +97,7 @@ func (b *Balancer) clusterDiscoveryAttempt(ctx context.Context) (err error) {
 		address = "ydb:///" + b.driverConfig.Endpoint()
 		onDone  = trace.DriverOnBalancerClusterDiscoveryAttempt(
 			b.driverConfig.Trace(), &ctx,
-			stack.FunctionID(""),
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).clusterDiscoveryAttempt"),
 			address,
 		)
 		endpoints []endpoint.Endpoint
@@ -173,7 +173,7 @@ func (b *Balancer) applyDiscoveredEndpoints(ctx context.Context, endpoints []end
 	var (
 		onDone = trace.DriverOnBalancerUpdate(
 			b.driverConfig.Trace(), &ctx,
-			stack.FunctionID(""),
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).applyDiscoveredEndpoints"),
 			b.config.DetectLocalDC,
 		)
 		previousConns []conn.Conn
@@ -211,7 +211,7 @@ func (b *Balancer) applyDiscoveredEndpoints(ctx context.Context, endpoints []end
 func (b *Balancer) Close(ctx context.Context) (err error) {
 	onDone := trace.DriverOnBalancerClose(
 		b.driverConfig.Trace(), &ctx,
-		stack.FunctionID(""),
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).Close"),
 	)
 	defer func() {
 		onDone(err)
@@ -237,7 +237,7 @@ func New(
 	var (
 		onDone = trace.DriverOnBalancerInit(
 			driverConfig.Trace(), &ctx,
-			stack.FunctionID(""),
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.New"),
 			driverConfig.Balancer().String(),
 		)
 		discoveryConfig = discoveryConfig.New(append(opts,
@@ -371,7 +371,7 @@ func (b *Balancer) connections() *connectionsState {
 func (b *Balancer) getConn(ctx context.Context) (c conn.Conn, err error) {
 	onDone := trace.DriverOnBalancerChooseEndpoint(
 		b.driverConfig.Trace(), &ctx,
-		stack.FunctionID(""),
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/balancer.(*Balancer).getConn"),
 	)
 	defer func() {
 		if err == nil {

diff --git a/internal/cmd/gstack/main.go b/internal/cmd/gstack/main.go
@@ -174,6 +174,7 @@ func processFile(src []byte, path string, fset *token.FileSet, file *ast.File, i
 			return err
 		}
 	}
+
 	return nil
 }
 

diff --git a/internal/cmd/gstack/utils/utils.go b/internal/cmd/gstack/utils/utils.go
@@ -50,7 +50,7 @@ func FixSource(fset *token.FileSet, path string, src []byte, listOfArgs []Functi
 			return nil, err
 		}
 		fixed = append(fixed, src[previousArgEnd:argPosOffset]...)
-		fixed = append(fixed, fmt.Sprintf("\"%q\"", argument)...)
+		fixed = append(fixed, fmt.Sprintf("%q", argument)...)
 		previousArgEnd = argEndOffset
 	}
 	fixed = append(fixed, src[previousArgEnd:]...)
@@ -85,6 +85,7 @@ func makeCall(fset *token.FileSet, path string, arg FunctionIDArg) (string, erro
 	if err != nil {
 		return "", err
 	}
+
 	return filepath.Join(basePath, filePath, packageName) + "." + funcName, nil
 }
 

diff --git a/internal/conn/conn.go b/internal/conn/conn.go
@@ -106,7 +106,7 @@ func (c *conn) NodeID() uint32 {
 func (c *conn) park(ctx context.Context) (err error) {
 	onDone := trace.DriverOnConnPark(
 		c.config.Trace(), &ctx,
-		stack.FunctionID(""),
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).park"),
 		c.Endpoint(),
 	)
 	defer func() {
@@ -149,7 +149,7 @@ func (c *conn) setState(ctx context.Context, s State) State {
 	if state := State(c.state.Swap(uint32(s))); state != s {
 		trace.DriverOnConnStateChange(
 			c.config.Trace(), &ctx,
-			stack.FunctionID(""),
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).setState"),
 			c.endpoint.Copy(), state,
 		)(s)
 	}
@@ -197,7 +197,7 @@ func (c *conn) realConn(ctx context.Context) (cc *grpc.ClientConn, err error) {
 
 	onDone := trace.DriverOnConnDial(
 		c.config.Trace(), &ctx,
-		stack.FunctionID(""),
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).realConn"),
 		c.endpoint.Copy(),
 	)
 	defer func() {
@@ -278,7 +278,7 @@ func (c *conn) Close(ctx context.Context) (err error) {
 
 	onDone := trace.DriverOnConnClose(
 		c.config.Trace(), &ctx,
-		stack.FunctionID(""),
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).Close"),
 		c.Endpoint(),
 	)
 	defer func() {
@@ -311,7 +311,7 @@ func (c *conn) Invoke(
 		useWrapping = UseWrapping(ctx)
 		onDone      = trace.DriverOnConnInvoke(
 			c.config.Trace(), &ctx,
-			stack.FunctionID(""),
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).Invoke"),
 			c.endpoint, trace.Method(method),
 		)
 		cc *grpc.ClientConn
@@ -395,7 +395,7 @@ func (c *conn) NewStream(
 	var (
 		onDone = trace.DriverOnConnNewStream(
 			c.config.Trace(), &ctx,
-			stack.FunctionID(""),
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*conn).NewStream"),
 			c.endpoint.Copy(), trace.Method(method),
 		)
 		useWrapping = UseWrapping(ctx)

diff --git a/internal/conn/grpc_client_stream.go b/internal/conn/grpc_client_stream.go
@@ -25,7 +25,7 @@ type grpcClientStream struct {
 }
 
 func (s *grpcClientStream) CloseSend() (err error) {
-	onDone := trace.DriverOnConnStreamCloseSend(s.c.config.Trace(), &s.ctx, stack.FunctionID(""))
+	onDone := trace.DriverOnConnStreamCloseSend(s.c.config.Trace(), &s.ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).CloseSend"))
 	defer func() {
 		onDone(err)
 	}()
@@ -56,7 +56,7 @@ 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(""))
+	onDone := trace.DriverOnConnStreamSendMsg(s.c.config.Trace(), &s.ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).SendMsg"))
 	defer func() {
 		onDone(err)
 	}()
@@ -95,7 +95,7 @@ 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(""))
+	onDone := trace.DriverOnConnStreamRecvMsg(s.c.config.Trace(), &s.ctx, 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
@@ -114,7 +114,7 @@ func (p *Pool) Ban(ctx context.Context, cc Conn, cause error) {
 
 	trace.DriverOnConnBan(
 		p.config.Trace(), &ctx,
-		stack.FunctionID(""),
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Ban"),
 		e, cc.GetState(), cause,
 	)(cc.SetState(ctx, Banned))
 }
@@ -136,7 +136,7 @@ func (p *Pool) Allow(ctx context.Context, cc Conn) {
 
 	trace.DriverOnConnAllow(
 		p.config.Trace(), &ctx,
-		stack.FunctionID(""),
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Allow"),
 		e, cc.GetState(),
 	)(cc.Unban(ctx))
 }
@@ -148,7 +148,7 @@ 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(""))
+	onDone := trace.DriverOnPoolRelease(p.config.Trace(), &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*Pool).Release"))
 	defer func() {
 		onDone(finalErr)
 	}()
@@ -230,7 +230,7 @@ func (p *Pool) collectConns() []*conn {
 }
 
 func NewPool(ctx context.Context, config Config) *Pool {
-	onDone := trace.DriverOnPoolNew(config.Trace(), &ctx, stack.FunctionID(""))
+	onDone := trace.DriverOnPoolNew(config.Trace(), &ctx, 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
@@ -40,7 +40,7 @@ func (c *Client) Discover(ctx context.Context) (endpoints []endpoint.Endpoint, e
 	var (
 		onDone = trace.DiscoveryOnDiscover(
 			c.config.Trace(), &ctx,
-			stack.FunctionID(""),
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/discovery.(*Client).Discover"),
 			c.config.Endpoint(), c.config.Database(),
 		)
 		request = Ydb_Discovery.ListEndpointsRequest{
@@ -99,7 +99,7 @@ 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(""))
+		onDone             = trace.DiscoveryOnWhoAmI(c.config.Trace(), &ctx, 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
@@ -115,7 +115,7 @@ func (m *Meta) meta(ctx context.Context) (_ metadata.MD, err error) {
 
 	var token string
 
-	done := trace.DriverOnGetCredentials(m.trace, &ctx, stack.FunctionID(""))
+	done := trace.DriverOnGetCredentials(m.trace, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/meta.(*Meta).meta"))
 	defer func() {
 		done(token, err)
 	}()

diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -163,7 +163,7 @@ func New[PT Item[T], T any](
 
 	onDone := p.trace.OnNew(&NewStartInfo{
 		Context: &ctx,
-		Call:    stack.FunctionID(""),
+		Call:    stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.New"),
 	})
 
 	defer func() {
@@ -264,7 +264,7 @@ func (p *Pool[PT, T]) Stats() stats.Stats {
 func (p *Pool[PT, T]) getItem(ctx context.Context) (_ PT, finalErr error) {
 	onDone := p.trace.OnGet(&GetStartInfo{
 		Context: &ctx,
-		Call:    stack.FunctionID(""),
+		Call:    stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).getItem"),
 	})
 	defer func() {
 		onDone(&GetDoneInfo{
@@ -324,7 +324,7 @@ func (p *Pool[PT, T]) getItem(ctx context.Context) (_ PT, finalErr error) {
 func (p *Pool[PT, T]) putItem(ctx context.Context, item PT) (finalErr error) {
 	onDone := p.trace.OnPut(&PutStartInfo{
 		Context: &ctx,
-		Call:    stack.FunctionID(""),
+		Call:    stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).putItem"),
 	})
 	defer func() {
 		onDone(&PutDoneInfo{
@@ -377,7 +377,7 @@ func (p *Pool[PT, T]) closeItem(ctx context.Context, item PT) error {
 func (p *Pool[PT, T]) try(ctx context.Context, f func(ctx context.Context, item PT) error) (finalErr error) {
 	onDone := p.trace.OnTry(&TryStartInfo{
 		Context: &ctx,
-		Call:    stack.FunctionID(""),
+		Call:    stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).try"),
 	})
 	defer func() {
 		onDone(&TryDoneInfo{
@@ -417,7 +417,7 @@ func (p *Pool[PT, T]) With(
 	var (
 		onDone = p.trace.OnWith(&WithStartInfo{
 			Context: &ctx,
-			Call:    stack.FunctionID(""),
+			Call:    stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).With"),
 		})
 		attempts int
 	)
@@ -452,7 +452,7 @@ func (p *Pool[PT, T]) With(
 func (p *Pool[PT, T]) Close(ctx context.Context) (finalErr error) {
 	onDone := p.trace.OnClose(&CloseStartInfo{
 		Context: &ctx,
-		Call:    stack.FunctionID(""),
+		Call:    stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/pool.(*Pool).Close"),
 	})
 	defer func() {
 		onDone(&CloseDoneInfo{

diff --git a/internal/query/client.go b/internal/query/client.go
@@ -163,7 +163,7 @@ func (c *Client) DoTx(ctx context.Context, op query.TxOperation, opts ...options
 }
 
 func New(ctx context.Context, balancer balancer, cfg *config.Config) *Client {
-	onDone := trace.QueryOnNew(cfg.Trace(), &ctx, stack.FunctionID(""))
+	onDone := trace.QueryOnNew(cfg.Trace(), &ctx, 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
@@ -40,7 +40,7 @@ func newResult(
 		closeResult = func() {}
 	}
 
-	onDone := trace.QueryOnResultNew(t, &ctx, stack.FunctionID(""))
+	onDone := trace.QueryOnResultNew(t, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.newResult"))
 	defer func() {
 		onDone(err)
 	}()
@@ -86,7 +86,7 @@ func nextPart(
 		t = &trace.Query{}
 	}
 
-	onDone := trace.QueryOnResultNextPart(t, &ctx, stack.FunctionID(""))
+	onDone := trace.QueryOnResultNextPart(t, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.nextPart"))
 	defer func() {
 		onDone(finalErr)
 	}()
@@ -100,7 +100,7 @@ func nextPart(
 }
 
 func (r *result) Close(ctx context.Context) (err error) {
-	onDone := trace.QueryOnResultClose(r.trace, &ctx, stack.FunctionID(""))
+	onDone := trace.QueryOnResultClose(r.trace, &ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).Close"))
 	defer func() {
 		onDone(err)
 	}()
@@ -176,7 +176,7 @@ 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(""))
+	onDone := trace.QueryOnResultNextResultSet(r.trace, &ctx, 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
@@ -85,7 +85,7 @@ 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(""))
+	onDone := trace.QueryOnResultSetNextRow(rs.trace, &ctx, 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
@@ -35,7 +35,7 @@ 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(""))
+	onDone := trace.QueryOnRowScan(r.trace, &r.ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.row.Scan"))
 	defer func() {
 		onDone(err)
 	}()
@@ -44,7 +44,7 @@ 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(""))
+	onDone := trace.QueryOnRowScanNamed(r.trace, &r.ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.row.ScanNamed"))
 	defer func() {
 		onDone(err)
 	}()
@@ -53,7 +53,7 @@ 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(""))
+	onDone := trace.QueryOnRowScanStruct(r.trace, &r.ctx, stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.row.ScanStruct"))
 	defer func() {
 		onDone(err)
 	}()
-Original file line number
+Diff line change
@@ Expand Up @@
     			return err
     		}
     	}
     	return nil
     }
@@ Expand Down @@