Added specific log message when HTTP 429 returned from error reportin…

…g URL
scoutapp · Jan 11, 2022 · 000bdce · 000bdce
1 parent 727ce10
commit 000bdce
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/src/Errors/ScoutClient/HttpErrorReportingClient.php b/src/Errors/ScoutClient/HttpErrorReportingClient.php
@@ -30,6 +30,7 @@ final class HttpErrorReportingClient implements ErrorReportingClient
     private const SCOUT_REPORTING_PATH = '/apps/error.scout';
 
     private const SCOUT_ACCEPTED_STATUS_CODE = 202;
+    private const SCOUT_TOO_MANY_REQUESTS    = 429;
 
     /** @var ClientInterface */
     private $client;
@@ -93,6 +94,18 @@ public function sendErrorToScout(array $errorEvents): void
         }
 
         $statusCode = $response->getStatusCode();
+
+        if ($statusCode === self::SCOUT_TOO_MANY_REQUESTS) {
+            $this->logger->notice(
+                sprintf(
+                    'Error send limit has been reached (HTTP %d returned from Error reporting service',
+                    self::SCOUT_TOO_MANY_REQUESTS
+                )
+            );
+
+            return;
+        }
+
         if ($statusCode !== self::SCOUT_ACCEPTED_STATUS_CODE) {
             $this->logger->info(
                 sprintf('ErrorEvent sending returned unexpected status code %d', $statusCode),

diff --git a/tests/Unit/Errors/ScoutClient/HttpErrorReportingClientTest.php b/tests/Unit/Errors/ScoutClient/HttpErrorReportingClientTest.php
@@ -157,6 +157,30 @@ public function testSendingErrorToScoutLogsFailureToInfo(): void
         self::assertTrue($this->logger->hasInfoThatContains('ErrorEvent sending returned unexpected status code 500'));
     }
 
+    public function testSendingErrorWhenErrorLimitReachedLogsMessage(): void
+    {
+        $errorEvent = ErrorEvent::fromThrowable(
+            Request::fromConfigAndOverrideTime(
+                $this->createMock(Superglobals::class),
+                $this->config,
+                $this->createMock(FindRequestHeaders::class)
+            ),
+            new RuntimeException('things')
+        );
+
+        $this->client
+            ->expects(self::once())
+            ->method('sendRequest')
+            ->with(self::isInstanceOf(RequestInterface::class))
+            ->willReturn(
+                (new Psr17Factory())->createResponse(429)
+            );
+
+        $this->errorReportingClient->sendErrorToScout([$errorEvent]);
+
+        self::assertTrue($this->logger->hasNoticeThatContains('Error send limit has been reached (HTTP 429 returned from Error reporting service'));
+    }
+
     public function testSendingErrorToScoutLogsClientExceptionInfo(): void
     {
         $errorEvent = ErrorEvent::fromThrowable(