Merge pull request #193 from ydb-platform/errors-renaming

* Renamed internal packages `errors`, `net` and `resolver`

CHANGELOG.md

@@ -1,3 +1,6 @@
+* Renamed internal packages `errors`, `net` and `resolver` to `xerrors`, `xnet` and `xresolver` for excluding ambiguous interpretation
+* Renamed internal error wrapper `xerrors.New` to `xerrors.Wrap`
+
 ## v3.18.3
 * Added `WithPanicCallback` option to all service configs (discovery, coordination, ratelimiter, scheme, scripting, table) and auto-applying from `ydb.WithPanicCallback`
 * Added panic recovering (if defined `ydb.WithPanicCallback` option) which thrown from retry operation

balancers/config.go

@@ -5,7 +5,7 @@ import (
  "fmt"
 
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
- "github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
+ "github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 )
 
 type balancerType string
@@ -57,7 +57,7 @@ func CreateFromConfig(config string) (balancer.Balancer, error) {
  )
 
  if err = json.Unmarshal([]byte(config), &c); err != nil {
- return nil, errors.WithStackTrace(err)
+ return nil, xerrors.WithStackTrace(err)
  }
 
  switch c.Type {
@@ -68,7 +68,7 @@ func CreateFromConfig(config string) (balancer.Balancer, error) {
  case typeRoundRobin:
  b = RoundRobin()
  default:
- return nil, errors.WithStackTrace(fmt.Errorf("unknown type of balancer: %s", c.Type))
+ return nil, xerrors.WithStackTrace(fmt.Errorf("unknown type of balancer: %s", c.Type))
  }
 
  switch c.Prefer {
@@ -79,7 +79,7 @@ func CreateFromConfig(config string) (balancer.Balancer, error) {
  return PreferLocalDC(b), nil
  case preferLocations:
  if len(c.Locations) == 0 {
- return nil, errors.WithStackTrace(fmt.Errorf("empty locations list in balancer '%s' config", c.Type))
+ return nil, xerrors.WithStackTrace(fmt.Errorf("empty locations list in balancer '%s' config", c.Type))
  }
  if c.Fallback {
  return PreferLocationsWithFallback(b, c.Locations...), nil

config/config.go

@@ -14,8 +14,8 @@ import (
  "github.com/ydb-platform/ydb-go-sdk/v3/credentials"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
- builder "github.com/ydb-platform/ydb-go-sdk/v3/internal/net"
- "github.com/ydb-platform/ydb-go-sdk/v3/internal/resolver"
+ builder "github.com/ydb-platform/ydb-go-sdk/v3/internal/xnet"
+ "github.com/ydb-platform/ydb-go-sdk/v3/internal/xresolver"
  "github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
@@ -299,7 +299,7 @@ func New(opts ...Option) Config {
  c.grpcOptions = append(
  c.grpcOptions,
  grpc.WithResolvers(
- resolver.New("ydb", c.trace),
+ xresolver.New("ydb", c.trace),
  ),
  )
  }

connection.go

@@ -16,8 +16,8 @@ import (
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/closer"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/database"
- "github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/lazy"
+ "github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
  "github.com/ydb-platform/ydb-go-sdk/v3/log"
  "github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter"
  ratelimiterConfig "github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter/config"
@@ -151,7 +151,7 @@ func (c *connection) Close(ctx context.Context) error {
  }
 
  if len(issues) > 0 {
- return errors.WithStackTrace(errors.NewWithIssues("close failed", issues...))
+ return xerrors.WithStackTrace(xerrors.NewWithIssues("close failed", issues...))
  }
 
  return nil
@@ -248,7 +248,7 @@ func New(ctx context.Context, opts ...Option) (_ Connection, err error) {
  for _, opt := range opts {
  err = opt(ctx, c)
  if err != nil {
- return nil, errors.WithStackTrace(err)
+ return nil, xerrors.WithStackTrace(err)
  }
  }
  c.config = config.New(c.options...)
@@ -292,7 +292,7 @@ func New(ctx context.Context, opts ...Option) (_ Connection, err error) {
  )...,
  )
  if err != nil {
- return nil, errors.WithStackTrace(err)
+ return nil, xerrors.WithStackTrace(err)
  }
 
  c.table = lazy.Table(

errors.go

@@ -5,39 +5,39 @@ import (
 
  "github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 
- "github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
  ratelimiterErrors "github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/errors"
+ "github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
  "github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter"
 )
 
 func IterateByIssues(err error, it func(message string, code Ydb.StatusIds_StatusCode, severity uint32)) {
- errors.IterateByIssues(err, it)
+ xerrors.IterateByIssues(err, it)
 }
 
 func IsTimeoutError(err error) bool {
- return errors.IsTimeoutError(err)
+ return xerrors.IsTimeoutError(err)
 }
 
 func IsTransportError(err error, codes ...grpcCodes.Code) bool {
- return errors.IsTransportError(err, codes...)
+ return xerrors.IsTransportError(err, codes...)
 }
 
-type Error errors.Error
+type Error xerrors.Error
 
 func TransportError(err error) Error {
- return errors.TransportError(err)
+ return xerrors.TransportError(err)
 }
 
 func IsYdbError(err error) bool {
- return errors.IsYdb(err)
+ return xerrors.IsYdb(err)
 }
 
 func IsOperationError(err error, codes ...Ydb.StatusIds_StatusCode) bool {
- return errors.IsOperationError(err, codes...)
+ return xerrors.IsOperationError(err, codes...)
 }
 
 func OperationError(err error) Error {
- return errors.OperationError(err)
+ return xerrors.OperationError(err)
 }
 
 func IsOperationErrorOverloaded(err error) bool {

internal/balancer/rr/rr.go

@@ -9,7 +9,7 @@ import (
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer/list"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
- "github.com/ydb-platform/ydb-go-sdk/v3/internal/rand"
+ "github.com/ydb-platform/ydb-go-sdk/v3/internal/xrand"
 )
 
 // roundRobin is an implementation of weighted round-robin balancing algorithm.
@@ -24,7 +24,7 @@ type roundRobin struct {
  belt []int
  next int32
  conns list.List
- r rand.Rand
+ r xrand.Rand
 }
 
 func (r *roundRobin) Create() balancer.Balancer {
@@ -33,14 +33,14 @@ func (r *roundRobin) Create() balancer.Balancer {
 
 func RoundRobin() balancer.Balancer {
  return &roundRobin{
- r: rand.New(rand.WithLock()),
+ r: xrand.New(xrand.WithLock()),
  }
 }
 
 func RandomChoice() balancer.Balancer {
  return &randomChoice{
  roundRobin: roundRobin{
- r: rand.New(rand.WithLock()),
+ r: xrand.New(xrand.WithLock()),
  },
  }
 }

internal/cluster/cluster.go

@@ -13,8 +13,8 @@ import (
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/cluster/entry"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"
- "github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
  "github.com/ydb-platform/ydb-go-sdk/v3/internal/repeater"
+ "github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
  "github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
@@ -24,10 +24,10 @@ const (
 
 var (
  // ErrClusterClosed returned when requested on a closed cluster.
- ErrClusterClosed = errors.New(fmt.Errorf("cluster closed"))
+ ErrClusterClosed = xerrors.Wrap(fmt.Errorf("cluster closed"))
 
  // ErrClusterEmpty returned when no connections left in cluster.
- ErrClusterEmpty = errors.New(fmt.Errorf("cluster empty"))
+ ErrClusterEmpty = xerrors.Wrap(fmt.Errorf("cluster empty"))
 )
 
 type cluster struct {
@@ -239,7 +239,7 @@ func (c *cluster) Close(ctx context.Context) (err error) {
  }
 
  if len(issues) > 0 {
- return errors.WithStackTrace(errors.NewWithIssues("cluster closed with issues", issues...))
+ return xerrors.WithStackTrace(xerrors.NewWithIssues("cluster closed with issues", issues...))
  }
 
  return nil
@@ -249,13 +249,13 @@ func (c *cluster) get(ctx context.Context) (cc conn.Conn, err error) {
  for {
  select {
  case <-c.done:
- return nil, errors.WithStackTrace(ErrClusterClosed)
+ return nil, xerrors.WithStackTrace(ErrClusterClosed)
  case <-ctx.Done():
- return nil, errors.WithStackTrace(ctx.Err())
+ return nil, xerrors.WithStackTrace(ctx.Err())
  default:
  cc = c.config.Balancer().Next()
  if cc == nil {
- return nil, errors.WithStackTrace(ErrClusterEmpty)
+ return nil, xerrors.WithStackTrace(ErrClusterEmpty)
  }
  if err = cc.Ping(ctx); err == nil {
  return cc, nil
@@ -272,7 +272,7 @@ func (c *cluster) Get(ctx context.Context) (cc conn.Conn, err error) {
  defer cancel()
 
  if c.isClosed() {
- return nil, errors.WithStackTrace(ErrClusterClosed)
+ return nil, xerrors.WithStackTrace(ErrClusterClosed)
  }
 
  onDone := trace.DriverOnClusterGet(c.config.Trace(), &ctx)

internal/cmd/gtrace/main.go

@@ -18,7 +18,7 @@ import (
  "strings"
  _ "unsafe" // For go:linkname.
 
- "github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
+ "github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 )
 
 //go:linkname build_goodOSArchFile go/build.(*Context).goodOSArchFile
@@ -287,7 +287,7 @@ func buildFunc(info types.Info, traces map[string]*Trace, fn *ast.FuncType) (ret
  case *ast.FuncType:
  result, err := buildFunc(info, traces, x)
  if err != nil {
- return nil, errors.WithStackTrace(err)
+ return nil, xerrors.WithStackTrace(err)
  }
  ret.Result = append(ret.Result, result)
  return ret, nil
@@ -405,7 +405,7 @@ func scanBuildConstraints(r io.Reader) (cs []string, err error) {
  for {
  line, err := br.ReadBytes('\n')
  if err != nil {
- return nil, errors.WithStackTrace(err)
+ return nil, xerrors.WithStackTrace(err)
  }
  line = bytes.TrimSpace(line)
  if comm := bytes.TrimPrefix(line, []byte("//")); !bytes.Equal(comm, line) {