wrap error in driver.error

Author: zhouselena

x/mongo/driver/topology/pool.go

@@ -55,10 +55,10 @@ type poolClearedError struct {
 }
 
 func (pce poolClearedError) Error() string {
-	wrappedErr := fmt.Errorf(
-		"%v: connection pool for %v was cleared because another operation failed with: %v %w",
-		driver.TransientTransactionError, pce.address, pce.err, pce)
-	return wrappedErr.Error()
+	return fmt.Sprintf(
+		"connection pool for %v was cleared because another operation failed with: %v",
+		pce.address,
+		pce.err)
 }
 
 // Retryable returns true. All poolClearedErrors are retryable.
@@ -503,7 +503,12 @@ func (p *pool) checkOut(ctx context.Context) (conn *connection, err error) {
 		}
 		return nil, ErrPoolClosed
 	case poolPaused:
-		err := poolClearedError{err: p.lastClearErr, address: p.address}
+		pcErr := poolClearedError{err: p.lastClearErr, address: p.address}
+		err := driver.Error{
+			Message: pcErr.Error(),
+			Labels:  []string{driver.TransientTransactionError},
+			Wrapped: pcErr,
+		}
 		p.stateMu.RUnlock()
 
 		duration := time.Since(start)

x/mongo/driver/topology/pool_test.go

@@ -1597,12 +1597,12 @@ func TestPool_Error(t *testing.T) {
 
 		// Since new pool is paused, checkout should throw PoolClearedError.
 		_, err := p.checkOut(context.Background())
-
-		var pce poolClearedError
-		if errors.As(err, &pce) {
-			assert.Contains(t, pce, driver.TransientTransactionError, `expected error to include the "TransientTransactionError" label`)
+		var le driver.Error
+		if errors.As(err, &le) {
+			assert.ErrorIs(t, poolClearedError{}, le.Unwrap(), "expect error to be PoolClearedError")
+			assert.True(t, le.HasErrorLabel(driver.TransientTransactionError), `expected error to include the "TransientTransactionError" label`)
 		} else {
-			t.Errorf("expected poolClearedError, got %v", err)
+			t.Errorf("expected labeled error, got %v", err)
 		}
 
 		p.close(context.Background())