bug #49104 [HttpClient] Fix collecting data non-late for the profiler (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit ef26e93f184e · 2023-01-25T19:34:40.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [HttpClient] Fix collecting data non-late for the profiler | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #49096 | License | MIT | Doc PR | - `@silverbackdan` `@pforesi` could you please confirm that this fixes both your use cases? Commits ------- 3cb1d70 [HttpClient] Fix collecting data non-late for the profiler
diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
@@ -38,22 +38,28 @@ public function registerClient(string $name, TraceableHttpClient $client)
      */
     public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
+        $this->lateCollect();
     }
 
     public function lateCollect()
     {
-        $this->reset();
+        $this->data['request_count'] = 0;
+        $this->data['error_count'] = 0;
+        $this->data += ['clients' => []];
 
         foreach ($this->clients as $name => $client) {
             [$errorCount, $traces] = $this->collectOnClient($client);
 
-            $this->data['clients'][$name] = [
-                'traces' => $traces,
-                'error_count' => $errorCount,
+            $this->data['clients'] += [
+                $name => [
+                    'traces' => [],
+                    'error_count' => 0,
+                ],
             ];
 
+            $this->data['clients'][$name]['traces'] = array_merge($this->data['clients'][$name]['traces'], $traces);
             $this->data['request_count'] += \count($traces);
-            $this->data['error_count'] += $errorCount;
+            $this->data['error_count'] += $this->data['clients'][$name]['error_count'] += $errorCount;
 
             $client->reset();
         }
