Merge branch 'master' into issue551

Author: asmyasnikov

config/config.go

@@ -46,7 +46,10 @@ func (c Config) ExcludeGRPCCodesForPessimization() []grpcCodes.Code {
 
 // GrpcDialOptions reports about used grpc dialing options
 func (c Config) GrpcDialOptions() []grpc.DialOption {
-	return c.grpcOptions
+	return append(
+		defaultGrpcOptions(c.trace, c.secure, c.tlsConfig),
+		c.grpcOptions...,
+	)
 }
 
 // Meta reports meta information about database connection
@@ -265,8 +268,6 @@ func New(opts ...Option) Config {
 		}
 	}
 
-	c.grpcOptions = append(defaultGrpcOptions(c.trace, c.secure, c.tlsConfig), c.grpcOptions...)
-
 	c.meta = meta.New(c.database, c.credentials, c.trace, c.metaOptions...)
 
 	return c

connection.go

@@ -443,10 +443,6 @@ func connect(ctx context.Context, c *connection) error {
 		onDone(err)
 	}()
 
-	if c.pool == nil {
-		c.pool = conn.NewPool(c.config)
-	}
-
 	if c.userInfo != nil {
 		c.config = c.config.With(config.WithCredentials(
 			credentials.NewStaticCredentials(
@@ -457,7 +453,11 @@ func connect(ctx context.Context, c *connection) error {
 		))
 	}
 
-	c.balancer, err = balancer.New(ctx, c.config, c.pool, c.discoveryOptions...)
+	if c.pool == nil {
+		c.pool = conn.NewPool(c.config)
+	}
+
+  c.balancer, err = balancer.New(ctx, c.config, c.pool, c.discoveryOptions...)
 	if err != nil {
 		return xerrors.WithStackTrace(err)
 	}

internal/conn/conn.go

@@ -53,7 +53,6 @@ func (c *conn) Address() string {
 type conn struct {
 	mtx               sync.RWMutex
 	config            Config // ro access
-	grpcDialOptions   []grpc.DialOption
 	cc                *grpc.ClientConn
 	done              chan struct{}
 	endpoint          endpoint.Endpoint // ro access
@@ -200,7 +199,11 @@ func (c *conn) take(ctx context.Context) (cc *grpc.ClientConn, err error) {
 	// three slashes in "ydb:///" is ok. It needs for good parse scheme in grpc resolver.
 	address := "ydb:///" + c.endpoint.Address()
 
-	cc, err = grpc.DialContext(ctx, address, c.grpcDialOptions...)
+	cc, err = grpc.DialContext(ctx, address, append(
+		[]grpc.DialOption{
+			grpc.WithStatsHandler(statsHandler{}),
+		}, c.config.GrpcDialOptions()...,
+	)...)
 	if err != nil {
 		err = xerrors.WithStackTrace(
 			xerrors.Retryable(
@@ -461,20 +464,11 @@ func withOnTransportError(onTransportError func(ctx context.Context, cc Conn, ca
 }
 
 func newConn(e endpoint.Endpoint, config Config, opts ...option) *conn {
-	grpcDialOptions := config.GrpcDialOptions()
-	grpcDialOptions = append(
-		append(
-			make([]grpc.DialOption, 0, len(grpcDialOptions)+1),
-			statsHandlerOption,
-		),
-		grpcDialOptions...,
-	)
 	c := &conn{
-		grpcDialOptions: grpcDialOptions,
-		state:           uint32(Created),
-		endpoint:        e,
-		config:          config,
-		done:            make(chan struct{}),
+		state:    uint32(Created),
+		endpoint: e,
+		config:   config,
+		done:     make(chan struct{}),
 	}
 	for _, o := range opts {
 		if o != nil {
@@ -493,8 +487,6 @@ var _ stats.Handler = statsHandler{}
 
 type statsHandler struct{}
 
-var statsHandlerOption = grpc.WithStatsHandler(statsHandler{})
-
 func (statsHandler) TagRPC(ctx context.Context, _ *stats.RPCTagInfo) context.Context {
 	return ctx
 }

internal/dsn/dsn.go

@@ -50,6 +50,9 @@ func Parse(dsn string) (info parsedInfo, err error) {
 	if err != nil {
 		return info, xerrors.WithStackTrace(err)
 	}
+	if port := uri.Port(); port == "" {
+		return info, xerrors.WithStackTrace(fmt.Errorf("bad connection string '%s': port required", dsn))
+	}
 	info.Endpoint = uri.Host
 	info.Database = uri.Path
 	info.Secure = uri.Scheme != insecureSchema