Fix Test

Signed-off-by: Pushpak Chhajed <[email protected]>

Author: pushpak1300

src/Telemetry/TelemetryCollector.php

@@ -4,79 +4,91 @@
 
 namespace Laravel\Boost\Telemetry;
 
-use const PHP_OS_FAMILY;
-use const PHP_VERSION;
-
 use Composer\InstalledVersions;
-use Illuminate\Support\Facades\Http;
+use Laravel\Boost\Concerns\MakesHttpRequests;
 use Throwable;
 
 class TelemetryCollector
 {
+    use MakesHttpRequests;
+
     protected const MAX_TOOLS_PER_FLUSH = 20;
 
     public array $toolCounts = [];
 
-    protected bool $shutdownRegistered = false;
+    protected bool $enabled;
 
-    public function record(string $toolName): void
-    {
-        if (! config('boost.telemetry.enabled')) {
-            return;
-        }
+    protected string $url;
 
-        $totalCount = array_sum($this->toolCounts);
-        if ($totalCount >= self::MAX_TOOLS_PER_FLUSH) {
-            $this->flush();
-        }
+    protected string $sessionId;
+
+    protected string $laravelVersion;
+
+    public function __construct()
+    {
+        $this->enabled = config('boost.telemetry.enabled', false);
+        if ($this->enabled) {
+            $this->url = config('boost.telemetry.url', 'https://boost.laravel.com/api/telemetry');
+            $this->sessionId = hash('sha256', base_path());
+            $this->laravelVersion = app()->version();
+            app()->terminating($this->flush(...));
 
-        if (! $this->shutdownRegistered) {
             if (extension_loaded('pcntl')) {
                 pcntl_async_signals(true);
                 pcntl_signal(SIGINT, $this->flush(...));
                 pcntl_signal(SIGTERM, $this->flush(...));
             }
+        }
+    }
 
-            register_shutdown_function([$this, 'flush']);
+    public function __destruct()
+    {
+        $this->flush();
+    }
 
-            app()->terminating($this->flush(...));
+    public function record(string $toolName): void
+    {
+        if (! $this->enabled) {
+            return;
+        }
 
-            $this->shutdownRegistered = true;
+        $totalCount = array_sum($this->toolCounts);
+        if ($totalCount >= self::MAX_TOOLS_PER_FLUSH) {
+            $this->flush();
         }
 
         $this->toolCounts[$toolName] = ($this->toolCounts[$toolName] ?? 0) + 1;
     }
 
     public function flush(): void
     {
-        if ($this->toolCounts === [] || ! config('boost.telemetry.enabled', true)) {
+        if ($this->toolCounts === [] || ! $this->enabled) {
             return;
         }
 
         try {
-            Http::timeout(5)
-                ->withHeaders(['User-Agent' => 'Laravel Boost Telemetry'])
-                ->post(config('boost.telemetry.url'), ['data' => $this->buildPayload()]);
+            $this->client()
+                ->timeout(5)
+                ->post($this->url, ['data' => $this->buildPayload()]);
         } catch (Throwable) {
             //
         } finally {
             $this->toolCounts = [];
         }
-
     }
 
     protected function buildPayload(): string
     {
         $version = InstalledVersions::getVersion('laravel/boost');
 
         return base64_encode(json_encode([
-            'session_id' => hash('sha256', base_path()),
+            'session_id' => $this->sessionId,
             'boost_version' => $version,
             'php_version' => PHP_VERSION,
             'os' => PHP_OS_FAMILY,
-            'laravel_version' => app()->version(),
+            'laravel_version' => $this->laravelVersion,
             'tools' => $this->toolCounts,
-            'timestamp' => now()->toIso8601String(),
+            'timestamp' => date('c'),
         ]));
     }
 }

tests/Unit/Telemetry/TelemetryCollectorTest.php

@@ -27,9 +27,10 @@
 it('does not record when disabled via config', function (): void {
     config(['boost.telemetry.enabled' => false]);
 
-    $this->collector->record(DatabaseQuery::class);
+    $collector = new TelemetryCollector;
+    $collector->record(DatabaseQuery::class);
 
-    expect($this->collector->toolCounts)->toBe([]);
+    expect($collector->toolCounts)->toBe([]);
 });
 
 it('auto-flushes when reaching MAX_TOOLS_PER_FLUSH', function (): void {
@@ -108,8 +109,9 @@
         '*' => Http::response(['status' => 'ok'], 200),
     ]);
 
-    $this->collector->toolCounts = ['SomeTool' => 1];
-    $this->collector->flush();
+    $collector = new TelemetryCollector;
+    $collector->toolCounts = ['SomeTool' => 1];
+    $collector->flush();
 
     expect(Http::recorded())->toHaveCount(0);
 });