remove assert eventually

Author: lohanidamodar

tests/Usage/UsageBase.php

@@ -10,33 +10,6 @@ trait UsageBase
 {
     protected Usage $usage;
 
-    /**
-     * Retry the provided assertions until they pass or timeout (seconds).
-     *
-     * @param callable $fn Assertions to run
-     * @param int $timeout Seconds to wait before failing
-     * @param float $interval Seconds between retries
-     */
-    protected function assertEventually(callable $fn, int $timeout = 5, float $interval = 0.5): void
-    {
-        $start = microtime(true);
-        $lastException = null;
-
-        while (microtime(true) - $start < $timeout) {
-            try {
-                $fn();
-                return;
-            } catch (\Throwable $e) {
-                $lastException = $e;
-                usleep((int) ($interval * 1_000_000));
-            }
-        }
-
-        if ($lastException) {
-            throw $lastException;
-        }
-    }
-
     abstract protected function initializeUsage(): void;
 
     public function setUp(): void
@@ -100,16 +73,14 @@ public function testLogBatch(): void
 
     public function testGetByPeriod(): void
     {
-        $this->assertEventually(function () {
-            $results1h = $this->usage->getByPeriod('requests', '1h');
-            $results1d = $this->usage->getByPeriod('requests', '1d');
-            $resultsInf = $this->usage->getByPeriod('storage', 'inf');
-
-            // SummingMergeTree / upsert-with-increase aggregates by deterministic id
-            $this->assertEquals(1, count($results1h));
-            $this->assertEquals(1, count($results1d));
-            $this->assertEquals(1, count($resultsInf));
-        });
+        $results1h = $this->usage->getByPeriod('requests', '1h');
+        $results1d = $this->usage->getByPeriod('requests', '1d');
+        $resultsInf = $this->usage->getByPeriod('storage', 'inf');
+
+        // SummingMergeTree / upsert-with-increase aggregates by deterministic id
+        $this->assertEquals(1, count($results1h));
+        $this->assertEquals(1, count($results1d));
+        $this->assertEquals(1, count($resultsInf));
     }
 
     public function testGetBetweenDates(): void
@@ -123,27 +94,23 @@ public function testGetBetweenDates(): void
 
     public function testCountByPeriod(): void
     {
-        $this->assertEventually(function () {
-            $count1h = $this->usage->countByPeriod('requests', '1h');
-            $count1d = $this->usage->countByPeriod('requests', '1d');
-            $countBandwidth = $this->usage->countByPeriod('bandwidth', '1h');
-
-            // Aggregated by deterministic id: multiple logs in same period/time collapse
-            $this->assertEquals(1, $count1h);
-            $this->assertEquals(1, $count1d);
-            $this->assertEquals(1, $countBandwidth);
-        });
+        $count1h = $this->usage->countByPeriod('requests', '1h');
+        $count1d = $this->usage->countByPeriod('requests', '1d');
+        $countBandwidth = $this->usage->countByPeriod('bandwidth', '1h');
+
+        // Aggregated by deterministic id: multiple logs in same period/time collapse
+        $this->assertEquals(1, $count1h);
+        $this->assertEquals(1, $count1d);
+        $this->assertEquals(1, $countBandwidth);
     }
 
     public function testSumByPeriod(): void
     {
-        $this->assertEventually(function () {
-            $sum = $this->usage->sumByPeriod('requests', '1h');
-            $this->assertEquals(250, $sum); // 100 + 150
+        $sum = $this->usage->sumByPeriod('requests', '1h');
+        $this->assertEquals(250, $sum); // 100 + 150
 
-            $sumBandwidth = $this->usage->sumByPeriod('bandwidth', '1h');
-            $this->assertEquals(5000, $sumBandwidth);
-        });
+        $sumBandwidth = $this->usage->sumByPeriod('bandwidth', '1h');
+        $this->assertEquals(5000, $sumBandwidth);
     }
 
     public function testIncrementingDefaultBehavior(): void
@@ -154,15 +121,13 @@ public function testIncrementingDefaultBehavior(): void
         // Log the same metric twice with identical period and tags
         $this->assertTrue($this->usage->log('increment-test', 5, '1h', []));
         $this->assertTrue($this->usage->log('increment-test', 7, '1h', []));
-        $this->assertEventually(function () {
-            // Because adapters now aggregate by deterministic id/time/period (and tenant where applicable),
-            // there should be a single record and the summed value should be 12.
-            $results = $this->usage->getByPeriod('increment-test', '1h');
-            $this->assertEquals(1, count($results));
-
-            $sum = $this->usage->sumByPeriod('increment-test', '1h');
-            $this->assertEquals(12, $sum);
-        }, 2);
+        // Because adapters now aggregate by deterministic id/time/period (and tenant where applicable),
+        // there should be a single record and the summed value should be 12.
+        $results = $this->usage->getByPeriod('increment-test', '1h');
+        $this->assertEquals(1, count($results));
+
+        $sum = $this->usage->sumByPeriod('increment-test', '1h');
+        $this->assertEquals(12, $sum);
     }
 
     public function testWithQueries(): void