Merge pull request #174 from ydb-platform/revert-meta

* Rollback moving `meta.Meta` call to conn exclusively from `internal…

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,6 @@
+* Rollback moving `meta.Meta` call to conn exclusively from `internal/db` and `internal/discovery`
+* Added `WithMeta()` discovery config option
+
 ## v3.16.5
 * Added `config.SharedPool()` setting and `config.WithSharedPool()` option
 * Added management of shared pool flag on change dial timeout and credentials 

connection.go

@@ -282,6 +282,7 @@ func New(ctx context.Context, opts ...Option) (_ Connection, err error) {
 				discoveryConfig.WithEndpoint(c.Endpoint()),
 				discoveryConfig.WithDatabase(c.Name()),
 				discoveryConfig.WithSecure(c.Secure()),
+				discoveryConfig.WithMeta(c.config.Meta()),
 				discoveryConfig.WithOperationTimeout(c.config.OperationTimeout()),
 				discoveryConfig.WithOperationCancelAfter(c.config.OperationCancelAfter()),
 			},

discovery/config/config.go

@@ -3,6 +3,7 @@ package config
 import (
 	"time"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
@@ -41,12 +42,16 @@ type Config interface {
 	// If Interval is zero then the DefaultInterval is used.
 	// If Interval is negative, then no background discovery prepared.
 	Interval() time.Duration
+
+	// Meta is an option which contains meta information about database connection
+	Meta() meta.Meta
 }
 
 type config struct {
 	endpoint string
 	database string
 	secure   bool
+	meta     meta.Meta
 
 	operationTimeout     time.Duration
 	operationCancelAfter time.Duration
@@ -55,6 +60,10 @@ type config struct {
 	trace    trace.Discovery
 }
 
+func (c *config) Meta() meta.Meta {
+	return c.meta
+}
+
 func (c *config) OperationTimeout() time.Duration {
 	return c.operationTimeout
 }
@@ -103,6 +112,12 @@ func WithSecure(ssl bool) Option {
 	}
 }
 
+func WithMeta(meta meta.Meta) Option {
+	return func(c *config) {
+		c.meta = meta
+	}
+}
+
 func WithTrace(trace trace.Discovery) Option {
 	return func(c *config) {
 		c.trace = c.trace.Compose(trace)

internal/conn/config.go

@@ -5,7 +5,6 @@ import (
 
 	"google.golang.org/grpc"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
@@ -14,6 +13,5 @@ type Config interface {
 	Trace() trace.Driver
 	ConnectionTTL() time.Duration
 	GrpcDialOptions() []grpc.DialOption
-	Meta() meta.Meta
 	UseDNSResolver() bool
 }

internal/conn/conn.go

@@ -339,14 +339,6 @@ func (c *conn) invoke(
 		)
 	}
 
-	ctx, err = c.config.Meta().Meta(ctx)
-	if err != nil {
-		return errors.NewGrpcError(
-			errors.WithStatus(grpcStatus.New(codes.Unavailable, "ydb driver conn apply meta failed")),
-			errors.WithErr(err),
-		)
-	}
-
 	c.changeUsages(1)
 	defer c.changeUsages(-1)
 
@@ -356,6 +348,7 @@ func (c *conn) invoke(
 		if s, ok := grpcStatus.FromError(err); ok {
 			return errors.NewGrpcError(
 				errors.WithStatus(s),
+				errors.WithErr(errors.WithStackTrace(err)),
 			)
 		}
 		return errors.WithStackTrace(err)
@@ -436,14 +429,6 @@ func (c *conn) newStream(
 		)
 	}
 
-	ctx, err = c.config.Meta().Meta(ctx)
-	if err != nil {
-		return nil, errors.NewGrpcError(
-			errors.WithStatus(grpcStatus.New(codes.Unavailable, "ydb driver conn apply meta failed")),
-			errors.WithErr(err),
-		)
-	}
-
 	c.changeStreamUsages(1)
 	defer c.changeStreamUsages(-1)
 
@@ -454,6 +439,7 @@ func (c *conn) newStream(
 		if s, ok := grpcStatus.FromError(err); ok {
 			return nil, errors.NewGrpcError(
 				errors.WithStatus(s),
+				errors.WithErr(errors.WithStackTrace(err)),
 			)
 		}
 		return nil, errors.WithStackTrace(err)

internal/db/database.go

@@ -120,6 +120,11 @@ func (db *database) Invoke(
 		}
 	}()
 
+	ctx, err = db.config.Meta().Meta(ctx)
+	if err != nil {
+		return errors.WithStackTrace(err)
+	}
+
 	err = cc.Invoke(ctx, method, args, reply, opts...)
 	if err != nil {
 		return errors.WithStackTrace(err)
@@ -145,6 +150,11 @@ func (db *database) NewStream(
 		}
 	}()
 
+	ctx, err = db.config.Meta().Meta(ctx)
+	if err != nil {
+		return nil, errors.WithStackTrace(err)
+	}
+
 	var client grpc.ClientStream
 	client, err = cc.NewStream(ctx, desc, method, opts...)
 	if err != nil {

internal/discovery/discovery.go

@@ -137,6 +137,11 @@ func (c *client) Discover(ctx context.Context) (endpoints []endpoint.Endpoint, e
 		onDone(location, nodes, err)
 	}()
 
+	ctx, err = c.config.Meta().Meta(ctx)
+	if err != nil {
+		return nil, errors.WithStackTrace(err)
+	}
+
 	response, err = c.service.ListEndpoints(ctx, &request)
 	if err != nil {
 		return nil, errors.WithStackTrace(err)
@@ -180,6 +185,11 @@ func (c *client) WhoAmI(ctx context.Context) (whoAmI *discovery.WhoAmI, err erro
 		}
 	}()
 
+	ctx, err = c.config.Meta().Meta(ctx)
+	if err != nil {
+		return nil, errors.WithStackTrace(err)
+	}
+
 	response, err = c.service.WhoAmI(ctx, &request)
 	if err != nil {
 		return nil, errors.WithStackTrace(err)

internal/errors/grpc.go

@@ -1,8 +1,6 @@
 package errors
 
 import (
-	"fmt"
-
 	"google.golang.org/grpc/status"
 )
 
@@ -14,11 +12,11 @@ type grpcError struct {
 
 func (e *grpcError) isYdbError() {}
 
-func (e *grpcError) Error() string {
+func (e *grpcError) Error() (s string) {
 	if e.err != nil {
-		return fmt.Sprintf("%s: %v", e.err, e.status.String())
+		s += e.err.Error() + ": "
 	}
-	return e.status.String()
+	return s + e.status.String()
 }
 
 func (e *grpcError) Unwrap() error {