fix: use wrapped context err when <-ctx.Done() case is executed

Author: Max Maximov

CHANGELOG.md

@@ -14,6 +14,8 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
 
 ### Fixed
 
+- Use wrapped context err when <-ctx.Done() case is executed
+
 ## [v2.4.0] - 2025-07-11
 
 This release focuses on adding schema/user/session operations, synchronous transaction

connection.go

@@ -984,7 +984,10 @@ func (conn *Connection) newFuture(req Request) (fut *Future) {
 	if ctx != nil {
 		select {
 		case <-ctx.Done():
-			fut.SetError(fmt.Errorf("context is done (request ID %d)", fut.requestId))
+			fut.SetError(fmt.Errorf(
+				"context is done (request ID %d): %w",
+				fut.requestId, context.Cause(ctx),
+			))
 			shard.rmut.Unlock()
 			return
 		default:
@@ -1026,7 +1029,10 @@ func (conn *Connection) contextWatchdog(fut *Future, ctx context.Context) {
 	case <-fut.done:
 		return
 	default:
-		conn.cancelFuture(fut, fmt.Errorf("context is done (request ID %d)", fut.requestId))
+		conn.cancelFuture(fut, fmt.Errorf(
+			"context is done (request ID %d): %w",
+			fut.requestId, context.Cause(ctx),
+		))
 	}
 }
 

example_test.go

@@ -16,7 +16,7 @@ import (
 type Tuple struct {
 	// Instruct msgpack to pack this struct as array, so no custom packer
 	// is needed.
-	_msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused
+	_msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused
 	Id       uint
 	Msg      string
 	Name     string
@@ -167,7 +167,7 @@ func ExamplePingRequest_Context() {
 	fmt.Println("Ping Error", regexp.MustCompile("[0-9]+").ReplaceAllString(err.Error(), "N"))
 	// Output:
 	// Ping Resp data []
-	// Ping Error context is done (request ID N)
+	// Ping Error context is done (request ID N): context deadline exceeded
 }
 
 func ExampleSelectRequest() {

tarantool_test.go

@@ -48,7 +48,7 @@ type Member struct {
 	Val   uint
 }
 
-var contextDoneErrRegexp = regexp.MustCompile(`^context is done \(request ID [0-9]+\)$`)
+var contextDoneErrRegexp = regexp.MustCompile(`^context is done \(request ID [0-9]+\):.+$`)
 
 func (m *Member) EncodeMsgpack(e *msgpack.Encoder) error {
 	if err := e.EncodeArrayLen(2); err != nil {
@@ -89,8 +89,8 @@ var indexNo = uint32(0)
 var indexName = "primary"
 var opts = Opts{
 	Timeout: 5 * time.Second,
-	//Concurrency: 32,
-	//RateLimit: 4*1024,
+	// Concurrency: 32,
+	// RateLimit: 4*1024,
 }
 
 const N = 500
@@ -727,7 +727,7 @@ func (req *mockRequest) Ctx() context.Context {
 }
 
 func (req *mockRequest) Response(header Header,
-	body io.Reader) (Response, error) {
+		body io.Reader) (Response, error) {
 	return nil, fmt.Errorf("some error")
 }
 
@@ -888,7 +888,7 @@ func TestFutureMultipleGetTypedWithError(t *testing.T) {
 	}
 }
 
-///////////////////
+// /////////////////
 
 func TestClient(t *testing.T) {
 	var err error
@@ -1286,7 +1286,7 @@ func TestClientSessionPush(t *testing.T) {
 
 const (
 	createTableQuery = "CREATE TABLE SQL_SPACE (ID STRING PRIMARY KEY, NAME " +
-		"STRING COLLATE \"unicode\" DEFAULT NULL);"
+			"STRING COLLATE \"unicode\" DEFAULT NULL);"
 	insertQuery              = "INSERT INTO SQL_SPACE VALUES (?, ?);"
 	selectNamedQuery         = "SELECT ID, NAME FROM SQL_SPACE WHERE ID=:ID AND NAME=:NAME;"
 	selectPosQuery           = "SELECT ID, NAME FROM SQL_SPACE WHERE ID=? AND NAME=?;"
@@ -1568,9 +1568,9 @@ func TestSQLBindings(t *testing.T) {
 		metaData, err := exResp.MetaData()
 		assert.NoError(t, err, "Error while getting MetaData")
 		if metaData[0].FieldType != "unsigned" ||
-			metaData[0].FieldName != "NAME0" ||
-			metaData[1].FieldType != "string" ||
-			metaData[1].FieldName != "NAME1" {
+				metaData[0].FieldName != "NAME0" ||
+				metaData[1].FieldType != "string" ||
+				metaData[1].FieldName != "NAME1" {
 			t.Error("Wrong metadata")
 		}
 	}
@@ -1595,9 +1595,9 @@ func TestSQLBindings(t *testing.T) {
 	metaData, err := exResp.MetaData()
 	assert.NoError(t, err, "Error while getting MetaData")
 	if metaData[0].FieldType != "unsigned" ||
-		metaData[0].FieldName != "NAME0" ||
-		metaData[1].FieldType != "string" ||
-		metaData[1].FieldName != "NAME1" {
+			metaData[0].FieldName != "NAME0" ||
+			metaData[1].FieldType != "string" ||
+			metaData[1].FieldName != "NAME1" {
 		t.Error("Wrong metadata")
 	}
 
@@ -1621,9 +1621,9 @@ func TestSQLBindings(t *testing.T) {
 	metaData, err = exResp.MetaData()
 	assert.NoError(t, err, "Error while getting MetaData")
 	if metaData[0].FieldType != "unsigned" ||
-		metaData[0].FieldName != "NAME0" ||
-		metaData[1].FieldType != "string" ||
-		metaData[1].FieldName != "NAME1" {
+			metaData[0].FieldName != "NAME0" ||
+			metaData[1].FieldType != "string" ||
+			metaData[1].FieldName != "NAME1" {
 		t.Error("Wrong metadata")
 	}
 }
@@ -1792,9 +1792,9 @@ func TestNewPrepared(t *testing.T) {
 	metaData, err := prepResp.MetaData()
 	assert.NoError(t, err, "Error while getting MetaData")
 	if metaData[0].FieldType != "unsigned" ||
-		metaData[0].FieldName != "NAME0" ||
-		metaData[1].FieldType != "string" ||
-		metaData[1].FieldName != "NAME1" {
+			metaData[0].FieldName != "NAME0" ||
+			metaData[1].FieldType != "string" ||
+			metaData[1].FieldName != "NAME1" {
 		t.Error("Wrong metadata")
 	}
 
@@ -1838,7 +1838,7 @@ func TestNewPrepared(t *testing.T) {
 
 func TestConnection_DoWithStrangerConn(t *testing.T) {
 	expectedErr := fmt.Errorf("the passed connected request doesn't belong to the current" +
-		" connection or connection pool")
+			" connection or connection pool")
 
 	conn1 := &Connection{}
 	req := test_helpers.NewMockRequest()
@@ -2054,7 +2054,7 @@ func TestSchema(t *testing.T) {
 		t.Errorf("index field has incorrect Id")
 	}
 	if (ifield1.Type != "num" && ifield1.Type != "unsigned") ||
-		(ifield2.Type != "STR" && ifield2.Type != "string") {
+			(ifield2.Type != "STR" && ifield2.Type != "string") {
 		t.Errorf("index field has incorrect Type '%s'", ifield2.Type)
 	}
 }
@@ -2506,7 +2506,7 @@ func testConnectionDoSelectRequestPrepare(t *testing.T, conn Connector) {
 }
 
 func testConnectionDoSelectRequestCheck(t *testing.T,
-	resp *SelectResponse, err error, pos bool, dataLen int, firstKey uint64) {
+		resp *SelectResponse, err error, pos bool, dataLen int, firstKey uint64) {
 	t.Helper()
 
 	if err != nil {
@@ -2716,7 +2716,7 @@ func TestCallRequest(t *testing.T) {
 func TestClientRequestObjectsWithNilContext(t *testing.T) {
 	conn := test_helpers.ConnectWithValidation(t, dialer, opts)
 	defer conn.Close()
-	req := NewPingRequest().Context(nil) //nolint
+	req := NewPingRequest().Context(nil) // nolint
 	data, err := conn.Do(req).Get()
 	if err != nil {
 		t.Fatalf("Failed to Ping: %s", err)
@@ -2834,8 +2834,8 @@ func TestComplexStructs(t *testing.T) {
 	}
 
 	if tuple.Cid != tuples[0].Cid ||
-		len(tuple.Members) != len(tuples[0].Members) ||
-		tuple.Members[1].Name != tuples[0].Members[1].Name {
+			len(tuple.Members) != len(tuples[0].Members) ||
+			tuple.Members[1].Name != tuples[0].Members[1].Name {
 		t.Errorf("Failed to selectTyped: incorrect data")
 		return
 	}
@@ -3146,7 +3146,7 @@ func TestStream_TxnIsolationLevel(t *testing.T) {
 
 func TestStream_DoWithStrangerConn(t *testing.T) {
 	expectedErr := fmt.Errorf("the passed connected request " +
-		"doesn't belong to the current connection or connection pool")
+			"doesn't belong to the current connection or connection pool")
 
 	conn := &Connection{}
 	stream, _ := conn.NewStream()
@@ -3269,7 +3269,7 @@ func TestClientIdRequestObjectWithNilContext(t *testing.T) {
 	req := NewIdRequest(ProtocolInfo{
 		Version:  ProtocolVersion(1),
 		Features: []iproto.Feature{iproto.IPROTO_FEATURE_STREAMS},
-	}).Context(nil) //nolint
+	}).Context(nil) // nolint
 	data, err := conn.Do(req).Get()
 	require.Nilf(t, err, "No errors on Id request execution")
 	require.NotNilf(t, data, "Response data not empty")
@@ -3293,7 +3293,7 @@ func TestClientIdRequestObjectWithPassedCanceledContext(t *testing.T) {
 	req := NewIdRequest(ProtocolInfo{
 		Version:  ProtocolVersion(1),
 		Features: []iproto.Feature{iproto.IPROTO_FEATURE_STREAMS},
-	}).Context(ctx) //nolint
+	}).Context(ctx) // nolint
 	cancel()
 	resp, err := conn.Do(req).Get()
 	require.Nilf(t, resp, "Response is empty")
@@ -3395,7 +3395,7 @@ func TestConnectionProtocolFeatureRequirementFail(t *testing.T) {
 	require.NotNilf(t, err, "Got error on connect")
 	require.Contains(t, err.Error(),
 		"invalid server protocol: protocol feature "+
-			"IPROTO_FEATURE_TRANSACTIONS is not supported")
+				"IPROTO_FEATURE_TRANSACTIONS is not supported")
 }
 
 func TestConnectionProtocolFeatureRequirementManyFail(t *testing.T) {
@@ -3416,7 +3416,7 @@ func TestConnectionProtocolFeatureRequirementManyFail(t *testing.T) {
 	require.Contains(t,
 		err.Error(),
 		"invalid server protocol: protocol features IPROTO_FEATURE_TRANSACTIONS, "+
-			"Feature(15532) are not supported")
+				"Feature(15532) are not supported")
 }
 
 func TestErrorExtendedInfoBasic(t *testing.T) {
@@ -3629,7 +3629,7 @@ func TestConnection_NewWatcher_noWatchersFeature(t *testing.T) {
 	require.Nilf(t, watcher, "watcher must not be created")
 	require.NotNilf(t, err, "an error is expected")
 	expected := "the feature IPROTO_FEATURE_WATCHERS must be supported by " +
-		"connection to create a watcher"
+			"connection to create a watcher"
 	require.Equal(t, expected, err.Error())
 }