Merge pull request #1407 from ydb-platform/fix-tracing-of-finish-event

neyguvj · web-flow · commit b6be3a9a666c · 2024-08-13T18:06:58.000+03:00
Cancel context after tracing "finish" event
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Fixed tracing of `(*grpcClientStream).finish` event
+
 ## v3.76.4
 * Added traces and logs for read messages from topic within transaction
 * Changed result type of `query.Session.NodeID()` from `int64` to `uint32` for compatibility with table session and discovery
diff --git a/internal/conn/grpc_client_stream.go b/internal/conn/grpc_client_stream.go
@@ -120,10 +120,10 @@ func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
 }
 
 func (s *grpcClientStream) finish(err error) {
-	s.streamCancel()
 	trace.DriverOnConnStreamFinish(s.parentConn.config.Trace(), s.streamCtx,
 		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*grpcClientStream).finish"), err,
 	)
+	s.streamCancel()
 }
 
 func (s *grpcClientStream) RecvMsg(m interface{}) (err error) { //nolint:funlen

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	+* Fixed tracing of `(*grpcClientStream).finish` event
	`2`	`+`
`1`	`3`	`## v3.76.4`
`2`	`4`	`* Added traces and logs for read messages from topic within transaction`
`3`	`5`	* Changed result type of `query.Session.NodeID()` from `int64` to `uint32` for compatibility with table session and discovery
Original file line number	Diff line number	Diff line change
`@@ -120,10 +120,10 @@ func (s *grpcClientStream) SendMsg(m interface{}) (err error) {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`func (s *grpcClientStream) finish(err error) {`
`123`		`- s.streamCancel()`
`124`	`123`	`trace.DriverOnConnStreamFinish(s.parentConn.config.Trace(), s.streamCtx,`
`125`	`124`	`stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/conn.(*grpcClientStream).finish"), err,`
`126`	`125`	`)`
	`126`	`+ s.streamCancel()`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`func (s *grpcClientStream) RecvMsg(m interface{}) (err error) { //nolint:funlen`