[HttpClient] Improve memory consumption

nicolas-grekas · nicolas-grekas · commit 44a5e567d208 · 2025-04-18T12:40:28.000+02:00
diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
@@ -36,6 +36,7 @@ final class HttpClientDataCollector extends DataCollector implements LateDataCol
     public function registerClient(string $name, TraceableHttpClient $client): void
     {
         $this->clients[$name] = $client;
+        $client->enabled = true;
     }
 
     public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
diff --git a/src/Symfony/Component/HttpClient/DependencyInjection/HttpClientPass.php b/src/Symfony/Component/HttpClient/DependencyInjection/HttpClientPass.php
@@ -27,7 +27,7 @@ public function process(ContainerBuilder $container): void
 
         foreach ($container->findTaggedServiceIds('http_client.client') as $id => $tags) {
             $container->register('.debug.'.$id, TraceableHttpClient::class)
-                ->setArguments([new Reference('.debug.'.$id.'.inner'), new Reference('debug.stopwatch', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])
+                ->setArguments([new Reference('.debug.'.$id.'.inner'), new Reference('debug.stopwatch', ContainerInterface::IGNORE_ON_INVALID_REFERENCE), false])
                 ->addTag('kernel.reset', ['method' => 'reset'])
                 ->setDecoratedService($id, null, 5);
             $container->getDefinition('data_collector.http_client')
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -126,9 +126,11 @@ public function __construct(
             curl_setopt($ch, \CURLOPT_NOPROGRESS, false);
             curl_setopt($ch, \CURLOPT_PROGRESSFUNCTION, static function ($ch, $dlSize, $dlNow) use ($onProgress, &$info, $url, $multi, $debugBuffer) {
                 try {
-                    rewind($debugBuffer);
-                    $debug = ['debug' => stream_get_contents($debugBuffer)];
-                    $onProgress($dlNow, $dlSize, $url + curl_getinfo($ch) + $info + $debug);
+                    if (\strlen($info['debug'] ?? '') !== ftell($debugBuffer)) {
+                        rewind($debugBuffer);
+                        $info['debug'] = stream_get_contents($debugBuffer);
+                    }
+                    $onProgress($dlNow, $dlSize, $url + curl_getinfo($ch) + $info);
                 } catch (\Throwable $e) {
                     $multi->handlesActivity[(int) $ch][] = null;
                     $multi->handlesActivity[(int) $ch][] = $e;
@@ -209,8 +211,10 @@ public function getInfo(?string $type = null): mixed
                 $info['starttransfer_time'] = 0.0;
             }
 
-            rewind($this->debugBuffer);
-            $info['debug'] = stream_get_contents($this->debugBuffer);
+            if (\strlen($info['debug'] ?? '') !== ftell($this->debugBuffer)) {
+                rewind($this->debugBuffer);
+                $info['debug'] = stream_get_contents($this->debugBuffer);
+            }
             $waitFor = curl_getinfo($this->handle, \CURLINFO_PRIVATE);
 
             if ('H' !== $waitFor[0] && 'C' !== $waitFor[0]) {
diff --git a/src/Symfony/Component/HttpClient/Response/TraceableResponse.php b/src/Symfony/Component/HttpClient/Response/TraceableResponse.php
@@ -34,7 +34,7 @@ class TraceableResponse implements ResponseInterface, StreamableInterface
     public function __construct(
         private HttpClientInterface $client,
         private ResponseInterface $response,
-        private mixed &$content,
+        private mixed &$content = false,
         private ?StopwatchEvent $event = null,
     ) {
     }
diff --git a/src/Symfony/Component/HttpClient/TraceableHttpClient.php b/src/Symfony/Component/HttpClient/TraceableHttpClient.php
@@ -31,15 +31,20 @@ final class TraceableHttpClient implements HttpClientInterface, ResetInterface,
     public function __construct(
         private HttpClientInterface $client,
         private ?Stopwatch $stopwatch = null,
+        public bool $enabled = true,
     ) {
         $this->tracedRequests = new \ArrayObject();
     }
 
     public function request(string $method, string $url, array $options = []): ResponseInterface
     {
+        if (!$this->enabled) {
+            return new TraceableResponse($this->client, $this->client->request($method, $url, $options));
+        }
+
         $content = null;
         $traceInfo = [];
-        $this->tracedRequests[] = [
+        $tracedRequest = [
             'method' => $method,
             'url' => $url,
             'options' => $options,
@@ -51,7 +56,9 @@ public function request(string $method, string $url, array $options = []): Respo
         if (false === ($options['extra']['trace_content'] ?? true)) {
             unset($content);
             $content = false;
+            unset($tracedRequest['options']['body'], $tracedRequest['options']['json']);
         }
+        $this->tracedRequests[] = $tracedRequest;
 
         $options['on_progress'] = function (int $dlNow, int $dlSize, array $info) use (&$traceInfo, $onProgress) {
             $traceInfo = $info;

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ final class HttpClientDataCollector extends DataCollector implements LateDataCol`
`36`	`36`	`public function registerClient(string $name, TraceableHttpClient $client): void`
`37`	`37`	`{`
`38`	`38`	`$this->clients[$name] = $client;`
	`39`	`+ $client->enabled = true;`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`public function collect(Request $request, Response $response, ?\Throwable $exception = null): void`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class TraceableResponse implements ResponseInterface, StreamableInterface`
`34`	`34`	`public function __construct(`
`35`	`35`	`private HttpClientInterface $client,`
`36`	`36`	`private ResponseInterface $response,`
`37`		`- private mixed &$content,`
	`37`	`+ private mixed &$content = false,`
`38`	`38`	`private ?StopwatchEvent $event = null,`
`39`	`39`	`) {`
`40`	`40`	`}`