simplified helper

Author: daniel-sanche

google/cloud/bigtable/data/_async/_mutate_rows.py

@@ -107,7 +107,7 @@ def __init__(
             metric.backoff_generator,
             operation_timeout,
             exception_factory=self._operation_metric.track_terminal_error(_retry_exception_factory),
-            on_error=self._operation_metric.track_retryable_error(),
+            on_error=self._operation_metric.track_retryable_error,
         )
         # initialize state
         self.timeout_generator = _attempt_timeout_generator(

google/cloud/bigtable/data/_async/_read_rows.py

@@ -124,7 +124,7 @@ def start_operation(self) -> CrossSync.Iterable[Row]:
             self._operation_metric.backoff_generator,
             self.operation_timeout,
             exception_factory=self._operation_metric.track_terminal_error(_retry_exception_factory),
-            on_error=self._operation_metric.track_retryable_error(),
+            on_error=self._operation_metric.track_retryable_error,
         )
 
     def _read_rows_attempt(self) -> CrossSync.Iterable[Row]:

google/cloud/bigtable/data/_async/client.py

@@ -1392,7 +1392,7 @@ async def execute_rpc():
                 operation_metric.backoff_generator,
                 operation_timeout,
                 exception_factory=operation_metric.track_terminal_error(_retry_exception_factory),
-                on_error=operation_metric.track_retryable_error(),
+                on_error=operation_metric.track_retryable_error,
             )
 
     @CrossSync.convert(replace_symbols={"MutationsBatcherAsync": "MutationsBatcher"})
@@ -1527,7 +1527,7 @@ async def mutate_row(
                 operation_metric.backoff_generator,
                 operation_timeout,
                 exception_factory=operation_metric.track_terminal_error(_retry_exception_factory),
-                on_error=operation_metric.track_retryable_error(),
+                on_error=operation_metric.track_retryable_error,
             )
 
     @CrossSync.convert

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

@@ -399,35 +399,32 @@ def _exc_to_status(exc: BaseException) -> StatusCode:
             return exc.code()
         return StatusCode.UNKNOWN
 
-    def track_retryable_error(self) -> callable[[Exception], None]:
+    def track_retryable_error(self, exc: Exception) -> None:
         """
         Used as input to api_core.Retry classes, to track when retryable errors are encountered
 
         Should be passed as on_error callback
         """
-
-        def wrapper(exc: Exception) -> None:
-            try:
-                # record metadata from failed rpc
-                if (
-                    isinstance(exc, GoogleAPICallError)
-                    and exc.errors
-                ):
-                    rpc_error = exc.errors[-1]
-                    metadata = list(rpc_error.trailing_metadata()) + list(
-                        rpc_error.initial_metadata()
-                    )
-                    self.add_response_metadata({k: v for k, v in metadata})
-            except Exception:
-                # ignore errors in metadata collection
-                pass
-            if isinstance(exc, _MutateRowsIncomplete):
-                # _MutateRowsIncomplete represents a successful rpc with some failed mutations
-                # mark the attempt as successful
-                self.end_attempt_with_status(StatusCode.OK)
-            else:
-                self.end_attempt_with_status(exc)
-        return wrapper
+        try:
+            # record metadata from failed rpc
+            if (
+                isinstance(exc, GoogleAPICallError)
+                and exc.errors
+            ):
+                rpc_error = exc.errors[-1]
+                metadata = list(rpc_error.trailing_metadata()) + list(
+                    rpc_error.initial_metadata()
+                )
+                self.add_response_metadata({k: v for k, v in metadata})
+        except Exception:
+            # ignore errors in metadata collection
+            pass
+        if isinstance(exc, _MutateRowsIncomplete):
+            # _MutateRowsIncomplete represents a successful rpc with some failed mutations
+            # mark the attempt as successful
+            self.end_attempt_with_status(StatusCode.OK)
+        else:
+            self.end_attempt_with_status(exc)
 
     def track_terminal_error(self, exception_factory:callable[
         [list[Exception], RetryFailureReason, float | None],tuple[Exception, Exception | None],
@@ -458,7 +455,7 @@ def wrapper(
             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.track_retryable_error(attempt_exc)
             self.end_with_status(source_exc)
             return source_exc, cause_exc
         return wrapper