Merge pull request #823 from ydb-platform/error-msg

fix error message

Author: asmyasnikov

internal/conn/conn.go

@@ -464,7 +464,7 @@ func (c *conn) wrapError(err error) error {
 	if err == nil {
 		return nil
 	}
-	nodeErr := newNodeError(c.endpoint.NodeID(), c.endpoint.Address(), err)
+	nodeErr := newConnError(c.endpoint.NodeID(), c.endpoint.Address(), err)
 	return xerrors.WithStackTrace(nodeErr, xerrors.WithSkipDepth(1))
 }
 

internal/conn/error.go

@@ -2,24 +2,24 @@ package conn
 
 import "fmt"
 
-type nodeError struct {
-	id       uint32
+type connError struct {
+	nodeID   uint32
 	endpoint string
 	err      error
 }
 
-func newNodeError(id uint32, endpoint string, err error) nodeError {
-	return nodeError{
-		id:       id,
+func newConnError(id uint32, endpoint string, err error) connError {
+	return connError{
+		nodeID:   id,
 		endpoint: endpoint,
 		err:      err,
 	}
 }
 
-func (n nodeError) Error() string {
-	return fmt.Sprintf("on node %v (%v): %v", n.id, n.endpoint, n.err)
+func (n connError) Error() string {
+	return fmt.Sprintf("connError(node_id = %d, address = %q): %v", n.nodeID, n.endpoint, n.err)
 }
 
-func (n nodeError) Unwrap() error {
+func (n connError) Unwrap() error {
 	return n.err
 }

internal/conn/error_test.go

@@ -9,15 +9,15 @@ import (
 
 func TestNodeErrorError(t *testing.T) {
 	testErr := errors.New("test")
-	nodeErr := newNodeError(1, "localhost:1234", testErr)
+	nodeErr := newConnError(1, "localhost:1234", testErr)
 	message := nodeErr.Error()
 
-	require.Equal(t, "on node 1 (localhost:1234): test", message)
+	require.Equal(t, "connError(node_id = 1, address = \"localhost:1234\"): test", message)
 }
 
 func TestNodeErrorUnwrap(t *testing.T) {
 	testErr := errors.New("test")
-	nodeErr := newNodeError(1, "asd", testErr)
+	nodeErr := newConnError(1, "asd", testErr)
 
 	unwrapped := errors.Unwrap(nodeErr)
 	require.Equal(t, testErr, unwrapped)
@@ -26,7 +26,7 @@ func TestNodeErrorUnwrap(t *testing.T) {
 func TestNodeErrorIs(t *testing.T) {
 	testErr := errors.New("test")
 	testErr2 := errors.New("test2")
-	nodeErr := newNodeError(1, "localhost:1234", testErr)
+	nodeErr := newConnError(1, "localhost:1234", testErr)
 
 	require.True(t, errors.Is(nodeErr, testErr))
 	require.False(t, errors.Is(nodeErr, testErr2))
@@ -50,7 +50,7 @@ func (t testErrorType2) Error() string {
 
 func TestNodeErrorAs(t *testing.T) {
 	testErr := testErrorType1{msg: "test"}
-	nodeErr := newNodeError(1, "localhost:1234", testErr)
+	nodeErr := newConnError(1, "localhost:1234", testErr)
 
 	target := testErrorType1{}
 	require.True(t, errors.As(nodeErr, &target))

internal/conn/grpc_client_stream.go

@@ -132,7 +132,7 @@ func (s *grpcClientStream) wrapError(err error) error {
 		return nil
 	}
 
-	nodeErr := newNodeError(s.c.endpoint.NodeID(), s.c.endpoint.Address(), err)
+	nodeErr := newConnError(s.c.endpoint.NodeID(), s.c.endpoint.Address(), err)
 	return xerrors.WithStackTrace(nodeErr, xerrors.WithSkipDepth(1))
 }