fix

Author: asmyasnikov

internal/pool/pool.go

@@ -380,6 +380,26 @@ func (p *Pool[PT, T]) changeState(changeState func() Stats) {
 	}
 }
 
+func (p *Pool[PT, T]) checkItemAndError(item PT, err error) error {
+	if !item.IsAlive() {
+		return errItemIsNotAlive
+	}
+
+	if err == nil {
+		return nil
+	}
+
+	if p.config.mustDeleteItemFunc(item, err) {
+		return err
+	}
+
+	if !xerrors.IsValid(err, item) {
+		return err
+	}
+
+	return nil
+}
+
 func (p *Pool[PT, T]) try(ctx context.Context, f func(ctx context.Context, item PT) error) (finalErr error) {
 	if onTry := p.config.trace.OnTry; onTry != nil {
 		onDone := onTry(&ctx,
@@ -417,7 +437,7 @@ func (p *Pool[PT, T]) try(ctx context.Context, f func(ctx context.Context, item
 	}
 
 	defer func() {
-		if !item.IsAlive() || (finalErr != nil && p.config.mustDeleteItemFunc(item, finalErr)) {
+		if err := p.checkItemAndError(item, finalErr); err != nil {
 			p.closeItem(ctx, item,
 				closeItemWithLock(),
 				closeItemNotifyStats(),

internal/query/transaction.go

@@ -322,10 +322,13 @@ func commitTx(ctx context.Context, client Ydb_Query_V1.QueryServiceClient, sessi
 }
 
 func (tx *Transaction) CommitTx(ctx context.Context) (finalErr error) {
+	onDone := trace.QueryOnTxCommit(tx.s.trace, &ctx,
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/query.(*Transaction).CommitTx"), tx.s, tx)
 	defer func() {
 		if finalErr != nil {
 			applyStatusByError(tx.s, finalErr)
 		}
+		onDone(finalErr)
 	}()
 
 	if tx.ID() == baseTx.LazyTxID {
@@ -367,12 +370,6 @@ func rollback(ctx context.Context, client Ydb_Query_V1.QueryServiceClient, sessi
 }
 
 func (tx *Transaction) Rollback(ctx context.Context) (finalErr error) {
-	defer func() {
-		if finalErr != nil {
-			applyStatusByError(tx.s, finalErr)
-		}
-	}()
-
 	if tx.ID() == baseTx.LazyTxID {
 		// https://github.com/ydb-platform/ydb-go-sdk/issues/1456
 		return tx.s.Close(ctx)
@@ -382,6 +379,15 @@ func (tx *Transaction) Rollback(ctx context.Context) (finalErr error) {
 		return nil
 	}
 
+	onDone := trace.QueryOnTxRollback(tx.s.trace, &ctx,
+		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/query.(*Transaction).Rollback"), tx.s, tx)
+	defer func() {
+		if finalErr != nil {
+			applyStatusByError(tx.s, finalErr)
+		}
+		onDone(finalErr)
+	}()
+
 	tx.completed = true
 
 	tx.notifyOnCompleted(ErrTransactionRollingBack)

internal/table/transaction.go

@@ -192,21 +192,21 @@ func (tx *transaction) CommitTx(
 
 // Rollback performs a rollback of the specified active transaction.
 func (tx *transaction) Rollback(ctx context.Context) (err error) {
-	onDone := trace.TableOnTxRollback(
-		tx.s.config.Trace(), &ctx,
-		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/table.(*transaction).Rollback"),
-		tx.s, tx,
-	)
-	defer func() {
-		onDone(err)
-	}()
-
 	switch tx.state.Load() {
 	case txStateCommitted:
 		return nil // nop for committed tx
 	case txStateRollbacked:
 		return xerrors.WithStackTrace(errTxRollbackedEarly)
 	default:
+		onDone := trace.TableOnTxRollback(
+			tx.s.config.Trace(), &ctx,
+			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/table.(*transaction).Rollback"),
+			tx.s, tx,
+		)
+		defer func() {
+			onDone(err)
+		}()
+
 		_, err = tx.s.client.RollbackTransaction(ctx,
 			&Ydb_Table.RollbackTransactionRequest{
 				SessionId: tx.s.id,