Add a custom retry strategy to retry 404

Author: Nyholm

composer.json

@@ -12,7 +12,7 @@
         "symfony/dotenv": "^5.1",
         "symfony/flex": "^1.8",
         "symfony/framework-bundle": "^5.1",
-        "symfony/http-client": "^5.1",
+        "symfony/http-client": "^v5.2.0-BETA3",
         "symfony/monolog-bundle": "~3.5",
         "symfony/security-core": "5.1.*",
         "symfony/twig-pack": "^1.0",
@@ -38,7 +38,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "5.1.*"
+            "require": "^5.1"
         }
     },
     "autoload": {

config/packages/github_api.yaml

@@ -7,6 +7,26 @@ services:
 
     Github\HttpClient\Builder:
         arguments:
-            - '@?Http\Client\HttpClient'
-            - '@?Http\Message\RequestFactory'
-            - '@?Http\Message\StreamFactory'
+            - '@github.httplug_client'
+            - '@Http\Message\RequestFactory'
+            - '@Http\Message\StreamFactory'
+
+    github.httplug_client:
+        class: Symfony\Component\HttpClient\HttplugClient
+        arguments:
+            - '@github.retryable_client'
+            - '@Psr\Http\Message\ResponseFactoryInterface'
+            - '@Psr\Http\Message\StreamFactoryInterface'
+
+    github.retryable_client:
+        class: Symfony\Component\HttpClient\RetryableHttpClient
+        arguments:
+            - '@http_client'
+            - '@github.retry_strategy'
+            - 2
+            - '@logger'
+
+    github.retry_strategy:
+        class: Symfony\Component\HttpClient\Retry\GenericRetryStrategy
+        arguments:
+            - [0, 404, 423, 425, 429, 500, 502, 503, 504, 507, 510]

src/Issues/GitHub/GitHubStatusApi.php

@@ -45,20 +45,12 @@ public function setIssueStatus($issueNumber, $newStatus, Repository $repository)
         }
 
         $newLabel = null === $newStatus ? null : self::$statusToLabel[$newStatus];
-        $this->logger->info(sprintf(
-            'Fetching issue labels for issue %s, repository %s',
-            $issueNumber,
-            $repository->getFullName()
-        ));
+        $this->logger->info(sprintf('Fetching issue labels for issue %s, repository %s', $issueNumber, $repository->getFullName()));
         $currentLabels = $this->labelsApi->getIssueLabels($issueNumber, $repository);
 
-        $this->logger->info(sprintf(
-            'Fetched the following labels: %s',
-            implode(', ', $currentLabels)
-        ));
+        $this->logger->info(sprintf('Fetched the following labels: %s', implode(', ', $currentLabels)));
 
         $addLabel = true;
-
         foreach ($currentLabels as $label) {
             // Ignore non-status, except when the bug is reviewed
             // but still marked as unconfirmed.
@@ -75,23 +67,13 @@ public function setIssueStatus($issueNumber, $newStatus, Repository $repository)
             }
 
             // Remove other statuses
-            $this->logger->debug(sprintf(
-                'Removing label %s from issue %s on repository %s',
-                $label,
-                $issueNumber,
-                $repository->getFullName()
-            ));
+            $this->logger->debug(sprintf('Removing label %s from issue %s on repository %s', $label, $issueNumber, $repository->getFullName()));
             $this->labelsApi->removeIssueLabel($issueNumber, $label, $repository);
         }
 
         // Ignored if the label is already set
         if ($addLabel && $newLabel) {
-            $this->logger->debug(sprintf(
-                'Adding label "%s" to issue %s on repository %s',
-                $newLabel,
-                $issueNumber,
-                $repository->getFullName()
-            ));
+            $this->logger->debug(sprintf('Adding label "%s" to issue %s on repository %s', $newLabel, $issueNumber, $repository->getFullName()));
             $this->labelsApi->addIssueLabel($issueNumber, $newLabel, $repository);
             $this->logger->debug('Label added!');
         }
@@ -108,7 +90,7 @@ public function getIssueStatus($issueNumber, Repository $repository)
         }
 
         // No status set
-        return;
+        return null;
     }
 
     public static function getNeedsReviewLabel()