record last attempt in exception factory

Author: daniel-sanche

google/cloud/bigtable/data/_helpers.py

@@ -103,6 +103,7 @@ def _retry_exception_factory(
         tuple[Exception, Exception|None]:
             tuple of the exception to raise, and a cause exception if applicable
     """
+    exc_list = exc_list.copy()
     if reason == RetryFailureReason.TIMEOUT:
         timeout_val_str = f"of {timeout_val:0.1f}s " if timeout_val is not None else ""
         # if failed due to timeout, raise deadline exceeded as primary exception

google/cloud/bigtable/data/_metrics/data_model.py

@@ -29,6 +29,7 @@
 from grpc.aio import AioRpcError
 
 from google.api_core.exceptions import GoogleAPICallError
+from google.api_core.retry import RetryFailureReason
 import google.cloud.bigtable.data.exceptions as bt_exceptions
 from google.cloud.bigtable_v2.types.response_params import ResponseParams
 from google.cloud.bigtable.data._helpers import TrackedBackoffGenerator
@@ -38,7 +39,6 @@
 
 if TYPE_CHECKING:
     from google.cloud.bigtable.data._metrics.handlers._base import MetricsHandler
-    from google.api_core.retry import RetryFailureReason
 
 
 LOGGER = logging.getLogger(__name__)
@@ -455,6 +455,10 @@ def wrapper(
             except Exception:
                 # ignore errors in metadata collection
                 pass
+            if reason == RetryFailureReason.TIMEOUT and self.state == OperationState.ACTIVE_ATTEMPT and exc_list:
+                # record ending attempt for timeout failures
+                attempt_exc = exc_list[-1]
+                self.track_retryable_error()(attempt_exc)
             self.end_with_status(source_exc)
             return source_exc, cause_exc
         return wrapper

tests/system/data/test_metrics_async.py

@@ -605,7 +605,7 @@ async def test_read_rows_stream_failure_unauthorized_with_retries(
             generator = await authorized_view.read_rows_stream(
                 ReadRowsQuery(row_filter=FamilyNameRegexFilter("unauthorized")),
                 retryable_errors=[PermissionDenied],
-                operation_timeout=0.1,
+                operation_timeout=0.5,
             )
             [_ async for _ in generator]
         assert e.value.grpc_status_code.name == "DEADLINE_EXCEEDED"
@@ -1257,7 +1257,7 @@ async def test_bulk_mutate_rows_failure_unauthorized_with_retries(
 
         handler.clear()
         with pytest.raises(MutationsExceptionGroup) as e:
-            await authorized_view.bulk_mutate_rows([entry], retryable_errors=[PermissionDenied], operation_timeout=25)
+            await authorized_view.bulk_mutate_rows([entry], retryable_errors=[PermissionDenied], operation_timeout=0.5)
         assert len(e.value.exceptions) == 1
         # validate counts
         assert len(handler.completed_operations) == 1
@@ -1656,7 +1656,7 @@ async def test_mutate_row_failure_unauthorized_with_retries(
         mutation = SetCell("unauthorized", b"q", b"v")
 
         with pytest.raises(GoogleAPICallError) as e:
-            await authorized_view.mutate_row(row_key, [mutation], retryable_errors=[PermissionDenied], operation_timeout=0.1)
+            await authorized_view.mutate_row(row_key, [mutation], retryable_errors=[PermissionDenied], operation_timeout=0.5)
         assert e.value.grpc_status_code.name == "DEADLINE_EXCEEDED"
         # validate counts
         assert len(handler.completed_operations) == 1