bot: replaced retry function with Tenacity

bot/code_coverage_bot/taskcluster.py

@@ -9,7 +9,7 @@
 import taskcluster
 from taskcluster.helper import TaskclusterConfig
 
-from code_coverage_bot.utils import retry
+import tenacity
 
 logger = structlog.getLogger(__name__)
 taskcluster_config = TaskclusterConfig("https://firefox-ci-tc.services.mozilla.com")
@@ -87,6 +87,7 @@ def download_artifact(artifact_path, task_id, artifact_name):
     url = queue.buildUrl("getLatestArtifact", task_id, artifact_name)
     logger.debug("Downloading artifact", url=url)
 
+    @tenacity.retry(wait=tenacity.wait_fixed(30), stop=tenacity.stop_after_attempt(5))
     def perform_download():
         r = requests.get(url, stream=True)
         r.raise_for_status()
@@ -97,8 +98,7 @@ def perform_download():
 
         if artifact_path.endswith(".zip") and not is_zipfile(artifact_path):
             raise BadZipFile("File is not a zip file")
-
-    retry(perform_download)
+    perform_download()
 
 
 def is_coverage_task(task):

bot/code_coverage_bot/uploader.py

@@ -7,9 +7,10 @@
 import zstandard as zstd
 
 from code_coverage_bot.secrets import secrets
-from code_coverage_bot.utils import retry
 from code_coverage_tools.gcp import get_bucket
 
+import tenacity
+
 logger = structlog.get_logger(__name__)
 GCP_COVDIR_PATH = "{repository}/{revision}/{platform}:{suite}.json.zstd"
 
@@ -45,10 +46,10 @@ def gcp(repository, revision, report, platform, suite):
     logger.info("Uploaded {} on {}".format(path, bucket))
 
     # Trigger ingestion on backend
-    retry(
-        lambda: gcp_ingest(repository, revision, platform, suite),
-        retries=10,
-        wait_between_retries=60,
+    @tenacity.retry(
+        retry = retry_if_exception(lambda: gcp_ingest(repository, revision, platform, suite)),
+        stop=stop_after_attempt(10),
+        wait=wait_fixed(60)
     )
 
     return blob

bot/code_coverage_bot/utils.py

@@ -10,28 +10,6 @@
 
 log = structlog.get_logger(__name__)
 
-
-class RunException(Exception):
-    """
-    Exception used to stop retrying
-    """
-
-
-def retry(
-    operation, retries=5, wait_between_retries=30, exception_to_break=RunException
-):
-    while True:
-        try:
-            return operation()
-        except Exception as e:
-            if isinstance(e, exception_to_break):
-                raise
-            retries -= 1
-            if retries == 0:
-                raise
-            time.sleep(wait_between_retries)
-
-
 def hide_secrets(text, secrets):
     if type(text) is bytes:
         encode_secret, xxx = lambda x: bytes(x, encoding="utf-8"), b"XXX"

bot/requirements-dev.txt

@@ -3,4 +3,4 @@ jsonschema==3.2.0
 pre-commit==1.21.0
 pytest==5.3.2
 pytest-responses==0.4.0
-responses==0.10.9
+responses==0.10.9

bot/requirements.txt

@@ -4,3 +4,4 @@ libmozdata==0.1.64
 pytoml==0.1.21
 pytz==2019.3
 zstandard==0.13.0
+tenacity==6.0.0