refactor(retry): migrate from backoff to tenacity

Author: TheKevJames

.pre-commit-config.yaml

@@ -96,7 +96,7 @@ repos:
     # `types-$lib` or `$lib-stubs`.
     additional_dependencies:
     - aiohttp==3.13.3
-    - backoff==2.2.1
+    - tenacity==9.1.2
     - cryptography==46.0.5
     - pyjwt==2.11.0
     - types-requests==2.32.4.20260107

auth/gcloud/aio/auth/token.py

@@ -17,9 +17,12 @@
 from urllib.parse import urlencode
 from urllib.parse import urlparse
 
-import backoff
 import cryptography  # pylint: disable=unused-import
 import jwt
+from tenacity import retry
+from tenacity import retry_if_exception_type
+from tenacity import stop_after_attempt
+from tenacity import wait_random_exponential
 
 from .build_constants import BUILD_GCLOUD_REST
 from .session import AioSession
@@ -263,7 +266,12 @@ async def ensure_token(self) -> None:
     async def refresh(self, *, timeout: int) -> TokenResponse:
         pass
 
-    @backoff.on_exception(backoff.expo, Exception, max_tries=5)
+    @retry(
+        retry=retry_if_exception_type(Exception),
+        stop=stop_after_attempt(5),
+        wait=wait_random_exponential(multiplier=1, max=60),
+        reraise=True,
+    )
     async def acquire_access_token(self, timeout: int = 10) -> None:
         resp = await self.refresh(timeout=timeout)
 

auth/poetry.lock

@@ -22,7 +22,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = ">= 3.10, < 4.0"
 # aiohttp = ">= 3.9.2, < 4.0.0"
-backoff = ">= 1.0.0, < 3.0.0"
+tenacity = ">= 8.2.0, < 10.0.0"
 chardet = ">= 2.0, < 7.0"
 # See https://cryptography.io/en/latest/api-stability/#deprecation
 cryptography = ">= 2.0.0, < 49.0.0"  # pin max to < (major + 3)

auth/pyproject.rest.toml

@@ -22,7 +22,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = ">= 3.10, < 4.0"
 aiohttp = ">= 3.9.2, < 4.0.0"
-backoff = ">= 1.0.0, < 3.0.0"
+tenacity = ">= 8.2.0, < 10.0.0"
 chardet = ">= 2.0, < 7.0"
 # See https://cryptography.io/en/latest/api-stability/#deprecation
 cryptography = ">= 2.0.0, < 49.0.0"  # pin max to < (major + 3)

auth/pyproject.toml

@@ -1,6 +1,5 @@
 import uuid
 
-import backoff
 import pytest
 from gcloud.aio.auth import BUILD_GCLOUD_REST  # pylint: disable=no-name-in-module
 from gcloud.aio.bigquery import SourceFormat
@@ -9,6 +8,12 @@
 from gcloud.aio.datastore import Key  # pylint: disable=no-name-in-module
 from gcloud.aio.datastore import PathElement  # pylint: disable=no-name-in-module
 from gcloud.aio.storage import Storage  # pylint: disable=no-name-in-module
+from tenacity import retry
+from tenacity import retry_if_exception_type
+from tenacity import retry_if_result
+from tenacity import stop_after_attempt
+from tenacity import stop_after_delay
+from tenacity import wait_fixed
 
 # Selectively load libraries based on the package
 if BUILD_GCLOUD_REST:
@@ -56,15 +61,22 @@ async def test_table_load_copy(
 
         operation = await ds.export(export_bucket_name, kinds=[kind])
 
-        def is_processing(operation):
+        def is_processing(operation) -> bool:
             return (
                 operation
                 and operation.metadata['common']['state'] == 'PROCESSING'
             )
 
-        operation = await backoff.on_predicate(
-            backoff.constant, is_processing, interval=10, max_tries=10)(
-                ds.get_datastore_operation)(operation.name)
+        @retry(
+            retry=retry_if_result(is_processing),
+            wait=wait_fixed(10),
+            stop=stop_after_attempt(10),
+            reraise=True,
+        )
+        async def get_operation_with_retry(name: str):
+            return await ds.get_datastore_operation(name)
+
+        operation = await get_operation_with_retry(operation.name)
 
         assert operation.metadata['common']['state'] == 'SUCCESSFUL'
         # END: copy from `test_datastore_export`
@@ -87,19 +99,34 @@ def is_processing(operation):
             source_format=SourceFormat.DATASTORE_BACKUP,
         )
 
-        source_table = await backoff.on_exception(
-            backoff.constant, Exception, max_time=60, jitter=None,
-            interval=10)(t.get)()
+        @retry(
+            retry=retry_if_exception_type(Exception),
+            wait=wait_fixed(10),
+            stop=stop_after_delay(60),
+            reraise=True,
+        )
+        async def get_source_table_with_retry():
+            return await t.get()
+
+        source_table = await get_source_table_with_retry()
         assert int(source_table['numRows']) > 0
 
         await t.insert_via_copy(project, dataset, copy_entity_table)
         t1 = Table(
             dataset, copy_entity_table, project=project,
             service_file=creds, session=s,
         )
-        copy_table = await backoff.on_exception(
-            backoff.constant, Exception, max_time=60, jitter=None,
-            interval=10)(t1.get)()
+
+        @retry(
+            retry=retry_if_exception_type(Exception),
+            wait=wait_fixed(10),
+            stop=stop_after_delay(60),
+            reraise=True,
+        )
+        async def get_copy_table_with_retry():
+            return await t1.get()
+
+        copy_table = await get_copy_table_with_retry()
         assert copy_table['numRows'] == source_table['numRows']
 
         # delete the backup and copy table