[HttpClient] Fix collecting data non-late for the profiler

nicolas-grekas · nicolas-grekas · commit cca73e71ddba · 2023-01-25T16:03:53.000+01:00
diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
@@ -38,25 +38,12 @@ public function registerClient(string $name, TraceableHttpClient $client)
      */
     public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
+        $this->doCollect(false);
     }
 
     public function lateCollect()
     {
-        $this->reset();
-
-        foreach ($this->clients as $name => $client) {
-            [$errorCount, $traces] = $this->collectOnClient($client);
-
-            $this->data['clients'][$name] = [
-                'traces' => $traces,
-                'error_count' => $errorCount,
-            ];
-
-            $this->data['request_count'] += \count($traces);
-            $this->data['error_count'] += $errorCount;
-
-            $client->reset();
-        }
+        $this->doCollect(true);
     }
 
     public function getClients(): array
@@ -91,6 +78,28 @@ public function reset()
         ];
     }
 
+    private function doCollect(bool $reset)
+    {
+        $this->data['request_count'] = 0;
+        $this->data['error_count'] = 0;
+
+        foreach ($this->clients as $name => $client) {
+            [$errorCount, $traces] = $this->collectOnClient($client);
+
+            $this->data['clients'][$name] = [
+                'traces' => $traces,
+                'error_count' => $errorCount,
+            ];
+
+            $this->data['request_count'] += \count($traces);
+            $this->data['error_count'] += $errorCount;
+
+            if ($reset) {
+                $client->reset();
+            }
+        }
+    }
+
     private function collectOnClient(TraceableHttpClient $client): array
     {
         $traces = $client->getTracedRequests();
