Add error message to failed requests (#1722)

Co-authored-by: sc <sc@local>
Co-authored-by: Alex Bouma <[email protected]>
Co-authored-by: Michi Hoffmann <[email protected]>

src/HttpClient/HttpClient.php

@@ -89,6 +89,7 @@ public function sendRequest(Request $request, Options $options): Response
             curl_setopt($curlHandle, \CURLOPT_PROXYUSERPWD, $httpProxyAuthentication);
         }
 
+        /** @var string|false $body */
         $body = curl_exec($curlHandle);
 
         if ($body === false) {
@@ -105,6 +106,8 @@ public function sendRequest(Request $request, Options $options): Response
 
         curl_close($curlHandle);
 
-        return new Response($statusCode, $responseHeaders, '');
+        $error = $statusCode >= 400 ? $body : '';
+
+        return new Response($statusCode, $responseHeaders, $error);
     }
 }

tests/HttpClient/HttpClientTest.php

@@ -71,9 +71,32 @@ public function testClientMakesUncompressedRequestWhenCompressionDisabled(): voi
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEquals($response->getStatusCode(), $serverOutput['status']);
         $this->assertEquals($request->getStringBody(), $serverOutput['body']);
+        $this->assertEquals($response->getError(), '');
         $this->assertEquals(\strlen($request->getStringBody()), $serverOutput['headers']['Content-Length']);
     }
 
+    public function testClientReturnsBodyAsErrorOnNonSuccessStatusCode(): void
+    {
+        $testServer = $this->startTestServer();
+
+        $options = new Options([
+            'dsn' => "http://publicKey@{$testServer}/400",
+        ]);
+
+        $request = new Request();
+        $request->setStringBody('test');
+
+        $client = new HttpClient('sentry.php', 'testing');
+        $response = $client->sendRequest($request, $options);
+
+        $this->stopTestServer();
+
+        $this->assertFalse($response->isSuccess());
+        $this->assertEquals(400, $response->getStatusCode());
+
+        $this->assertEquals($request->getStringBody(), $response->getError());
+    }
+
     public function testThrowsExceptionIfDsnOptionIsNotSet(): void
     {
         $this->expectException(\RuntimeException::class);

tests/testserver/index.php

@@ -53,4 +53,4 @@
 
 http_response_code($status);
 
-return 'Processed.';
+echo $body;