Merge branch 'master' into master

Author: korovindenis

CHANGELOG.md

@@ -1,6 +1,12 @@
-
 * Added type assertion checks to enhance type safety and prevent unexpected panics in critical sections of the codebase
 
+## v3.66.3
+* Fixed the OAuth2 test
+
+## v3.66.2
+* Added `trace.DriverConnStreamEvents` details bit
+* Added `trace.Driver.OnConnStreamFinish` event
+
 ## v3.66.1
 * Added flush messages from buffer before close topic writer
 * Added Flush method for topic writer

internal/conn/conn.go

@@ -51,7 +51,7 @@ type Conn interface {
 type conn struct {
 	mtx               sync.RWMutex
 	config            Config // ro access
-	cc                *grpc.ClientConn
+	grpcConn          *grpc.ClientConn
 	done              chan struct{}
 	endpoint          endpoint.Endpoint // ro access
 	closed            bool
@@ -121,7 +121,7 @@ func (c *conn) park(ctx context.Context) (err error) {
 		return nil
 	}
 
-	if c.cc == nil {
+	if c.grpcConn == nil {
 		return nil
 	}
 
@@ -161,7 +161,7 @@ func (c *conn) setState(ctx context.Context, s State) State {
 func (c *conn) Unban(ctx context.Context) State {
 	var newState State
 	c.mtx.RLock()
-	cc := c.cc
+	cc := c.grpcConn
 	c.mtx.RUnlock()
 	if isAvailable(cc) {
 		newState = Online
@@ -186,8 +186,8 @@ func (c *conn) realConn(ctx context.Context) (cc *grpc.ClientConn, err error) {
 	c.mtx.Lock()
 	defer c.mtx.Unlock()
 
-	if c.cc != nil {
-		return c.cc, nil
+	if c.grpcConn != nil {
+		return c.grpcConn, nil
 	}
 
 	if dialTimeout := c.config.DialTimeout(); dialTimeout > 0 {
@@ -234,10 +234,10 @@ func (c *conn) realConn(ctx context.Context) (cc *grpc.ClientConn, err error) {
 		)
 	}
 
-	c.cc = cc
+	c.grpcConn = cc
 	c.setState(ctx, Online)
 
-	return c.cc, nil
+	return c.grpcConn, nil
 }
 
 func (c *conn) onTransportError(ctx context.Context, cause error) {
@@ -252,11 +252,11 @@ func isAvailable(raw *grpc.ClientConn) bool {
 
 // conn must be locked
 func (c *conn) close(ctx context.Context) (err error) {
-	if c.cc == nil {
+	if c.grpcConn == nil {
 		return nil
 	}
-	err = c.cc.Close()
-	c.cc = nil
+	err = c.grpcConn.Close()
+	c.grpcConn = nil
 	c.setState(ctx, Offline)
 
 	return c.wrapError(err)
@@ -423,19 +423,23 @@ func (c *conn) NewStream(
 
 	ctx, sentMark := markContext(meta.WithTraceID(ctx, traceID))
 
-	ctx, cancel := xcontext.WithCancel(ctx)
+	ctx, cancel := c.childStreams.WithCancel(ctx)
 	defer func() {
 		if finalErr != nil {
 			cancel()
-		} else {
-			c.childStreams.Remember(&cancel)
 		}
 	}()
 
-	s, err := cc.NewStream(ctx, desc, method, append(opts, grpc.OnFinish(func(err error) {
-		cancel()
-		c.childStreams.Forget(&cancel)
-	}))...)
+	s := &grpcClientStream{
+		parentConn:   c,
+		streamCtx:    ctx,
+		streamCancel: cancel,
+		wrapping:     useWrapping,
+		traceID:      traceID,
+		sentMark:     sentMark,
+	}
+
+	s.stream, err = cc.NewStream(ctx, desc, method, append(opts, grpc.OnFinish(s.finish))...)
 	if err != nil {
 		if xerrors.IsContextError(err) {
 			return nil, xerrors.WithStackTrace(err)
@@ -451,25 +455,16 @@ func (c *conn) NewStream(
 				xerrors.WithTraceID(traceID),
 			)
 			if sentMark.canRetry() {
-				return s, c.wrapError(xerrors.Retryable(err, xerrors.WithName("NewStream")))
+				return nil, c.wrapError(xerrors.Retryable(err, xerrors.WithName("NewStream")))
 			}
 
-			return s, c.wrapError(err)
+			return nil, c.wrapError(err)
 		}
 
-		return s, err
+		return nil, err
 	}
 
-	return &grpcClientStream{
-		ClientStream: s,
-		c:            c,
-		wrapping:     useWrapping,
-		traceID:      traceID,
-		sentMark:     sentMark,
-		onDone: func(ctx context.Context, md metadata.MD) {
-			meta.CallTrailerCallback(ctx, md)
-		},
-	}, nil
+	return s, nil
 }
 
 func (c *conn) wrapError(err error) error {

internal/conn/grpc_client_stream.go

@@ -8,36 +8,50 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/wrap"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
 type grpcClientStream struct {
-	grpc.ClientStream
-	c        *conn
-	wrapping bool
-	traceID  string
-	sentMark *modificationMark
-	onDone   func(ctx context.Context, md metadata.MD)
+	parentConn   *conn
+	stream       grpc.ClientStream
+	streamCtx    context.Context //nolint:containedctx
+	streamCancel context.CancelFunc
+	wrapping     bool
+	traceID      string
+	sentMark     *modificationMark
+}
+
+func (s *grpcClientStream) Header() (metadata.MD, error) {
+	return s.stream.Header()
+}
+
+func (s *grpcClientStream) Trailer() metadata.MD {
+	return s.stream.Trailer()
+}
+
+func (s *grpcClientStream) Context() context.Context {
+	return s.stream.Context()
 }
 
 func (s *grpcClientStream) CloseSend() (err error) {
 	var (
-		ctx    = s.Context()
-		onDone = trace.DriverOnConnStreamCloseSend(s.c.config.Trace(), &ctx,
+		ctx    = s.streamCtx
+		onDone = trace.DriverOnConnStreamCloseSend(s.parentConn.config.Trace(), &ctx,
 			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).CloseSend"),
 		)
 	)
 	defer func() {
 		onDone(err)
 	}()
 
-	stop := s.c.lastUsage.Start()
+	stop := s.parentConn.lastUsage.Start()
 	defer stop()
 
-	err = s.ClientStream.CloseSend()
+	err = s.stream.CloseSend()
 
 	if err != nil {
 		if xerrors.IsContextError(err) {
@@ -48,7 +62,7 @@ func (s *grpcClientStream) CloseSend() (err error) {
 			return s.wrapError(
 				xerrors.Transport(
 					err,
-					xerrors.WithAddress(s.c.Address()),
+					xerrors.WithAddress(s.parentConn.Address()),
 					xerrors.WithTraceID(s.traceID),
 				),
 			)
@@ -62,32 +76,32 @@ func (s *grpcClientStream) CloseSend() (err error) {
 
 func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
 	var (
-		ctx    = s.Context()
-		onDone = trace.DriverOnConnStreamSendMsg(s.c.config.Trace(), &ctx,
+		ctx    = s.streamCtx
+		onDone = trace.DriverOnConnStreamSendMsg(s.parentConn.config.Trace(), &ctx,
 			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).SendMsg"),
 		)
 	)
 	defer func() {
 		onDone(err)
 	}()
 
-	stop := s.c.lastUsage.Start()
+	stop := s.parentConn.lastUsage.Start()
 	defer stop()
 
-	err = s.ClientStream.SendMsg(m)
+	err = s.stream.SendMsg(m)
 
 	if err != nil {
 		if xerrors.IsContextError(err) {
 			return xerrors.WithStackTrace(err)
 		}
 
 		defer func() {
-			s.c.onTransportError(ctx, err)
+			s.parentConn.onTransportError(ctx, err)
 		}()
 
 		if s.wrapping {
 			err = xerrors.Transport(err,
-				xerrors.WithAddress(s.c.Address()),
+				xerrors.WithAddress(s.parentConn.Address()),
 				xerrors.WithTraceID(s.traceID),
 			)
 			if s.sentMark.canRetry() {
@@ -105,28 +119,31 @@ func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
 	return nil
 }
 
+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/3/internal/conn.(*grpcClientStream).finish"), err,
+	)
+}
+
 func (s *grpcClientStream) RecvMsg(m interface{}) (err error) {
 	var (
-		ctx    = s.Context()
-		onDone = trace.DriverOnConnStreamRecvMsg(s.c.config.Trace(), &ctx,
+		ctx    = s.streamCtx
+		onDone = trace.DriverOnConnStreamRecvMsg(s.parentConn.config.Trace(), &ctx,
 			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/conn.(*grpcClientStream).RecvMsg"),
 		)
 	)
 	defer func() {
 		onDone(err)
-	}()
-
-	stop := s.c.lastUsage.Start()
-	defer stop()
-
-	defer func() {
 		if err != nil {
-			md := s.ClientStream.Trailer()
-			s.onDone(ctx, md)
+			meta.CallTrailerCallback(s.streamCtx, s.stream.Trailer())
 		}
 	}()
 
-	err = s.ClientStream.RecvMsg(m)
+	stop := s.parentConn.lastUsage.Start()
+	defer stop()
+
+	err = s.stream.RecvMsg(m)
 
 	if err != nil { //nolint:nestif
 		if xerrors.IsContextError(err) {
@@ -135,13 +152,13 @@ func (s *grpcClientStream) RecvMsg(m interface{}) (err error) {
 
 		defer func() {
 			if !xerrors.Is(err, io.EOF) {
-				s.c.onTransportError(ctx, err)
+				s.parentConn.onTransportError(ctx, err)
 			}
 		}()
 
 		if s.wrapping {
 			err = xerrors.Transport(err,
-				xerrors.WithAddress(s.c.Address()),
+				xerrors.WithAddress(s.parentConn.Address()),
 			)
 			if s.sentMark.canRetry() {
 				return s.wrapError(xerrors.Retryable(err,
@@ -161,7 +178,7 @@ func (s *grpcClientStream) RecvMsg(m interface{}) (err error) {
 				return s.wrapError(
 					xerrors.Operation(
 						xerrors.FromOperation(operation),
-						xerrors.WithAddress(s.c.Address()),
+						xerrors.WithAddress(s.parentConn.Address()),
 					),
 				)
 			}
@@ -177,7 +194,7 @@ func (s *grpcClientStream) wrapError(err error) error {
 	}
 
 	return xerrors.WithStackTrace(
-		newConnError(s.c.endpoint.NodeID(), s.c.endpoint.Address(), err),
+		newConnError(s.parentConn.endpoint.NodeID(), s.parentConn.endpoint.Address(), err),
 		xerrors.WithSkipDepth(1),
 	)
 }

internal/credentials/oauth2_test.go

@@ -9,8 +9,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"os/user"
-	"path/filepath"
 	"reflect"
 	"strconv"
 	"testing"
@@ -430,23 +428,16 @@ func TestJWTTokenBadParams(t *testing.T) {
 }
 
 func TestJWTTokenSourceReadPrivateKeyFromFile(t *testing.T) {
-	const perm = 0o600
-	usr, err := user.Current()
+	f, err := os.CreateTemp("", "tmpfile-")
 	require.NoError(t, err)
-	fileName := strconv.Itoa(time.Now().Second())
-	filePath := filepath.Join(usr.HomeDir, fileName)
-	beautifulFilePath := filepath.Join("~", fileName)
-	err = os.WriteFile(
-		filePath,
-		[]byte(testPrivateKeyContent),
-		perm,
-	)
+	defer os.Remove(f.Name())
+	_, err = f.WriteString(testPrivateKeyContent)
 	require.NoError(t, err)
-	defer os.Remove(filePath)
+	f.Close()
 
 	var src TokenSource
 	src, err = NewJWTTokenSource(
-		WithRSAPrivateKeyPEMFile(beautifulFilePath),
+		WithRSAPrivateKeyPEMFile(f.Name()),
 		WithKeyID("key_id"),
 		WithSigningMethod(jwt.SigningMethodRS256),
 		WithIssuer("test_issuer"),

internal/version/version.go

@@ -3,7 +3,7 @@ package version
 const (
 	Major = "3"
 	Minor = "66"
-	Patch = "1"
+	Patch = "3"
 
 	Prefix = "ydb-go-sdk"
 )