Merge branch '1.6.x' into test-fix-cloud

chore: fix console audits delete

.env

@@ -86,6 +86,7 @@ _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
+_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_USAGE_AGGREGATION_INTERVAL=30
 _APP_STATS_RESOURCES_INTERVAL=3600
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000

app/config/variables.php

@@ -1048,13 +1048,22 @@ return [
             ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
-                'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
+                'description' => 'The maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
                 'introduction' => '0.7.0',
                 'default' => '1209600',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
+            [
+                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE',
+                'description' => 'The maximum duration (in seconds) upto which to retain console audit logs. The default value is 15778800 seconds (6 months).',
+                'introduction' => '1.6.2',
+                'default' => '15778800',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
                 'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',

app/views/install/compose.phtml

@@ -148,6 +148,7 @@ $image = $this->getParam('image', '');
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -340,6 +341,7 @@ $image = $this->getParam('image', '');
       - _APP_EXECUTOR_HOST
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_EMAIL_CERTIFICATES
@@ -651,6 +653,7 @@ $image = $this->getParam('image', '');
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
 

app/worker.php

@@ -215,15 +215,18 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
 }, ['pools', 'cache']);
 
 Server::setResource('abuseRetention', function () {
-    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400);
+    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
 });
 
 Server::setResource('auditRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600));
+    return [
+        'project' => DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)), // 14 days
+        'console' => DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)) // 6 months
+    ];
 });
 
 Server::setResource('executionRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600));
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
 });
 
 Server::setResource('cache', function (Registry $register) {

composer.lock

@@ -753,16 +753,16 @@
         },
         {
             "name": "jean85/pretty-package-versions",
-            "version": "2.1.0",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Jean85/pretty-package-versions.git",
-                "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10"
+                "reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/3c4e5f62ba8d7de1734312e4fff32f67a8daaf10",
-                "reference": "3c4e5f62ba8d7de1734312e4fff32f67a8daaf10",
+                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/4d7aa5dab42e2a76d99559706022885de0e18e1a",
+                "reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a",
                 "shasum": ""
             },
             "require": {
@@ -772,8 +772,9 @@
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.2",
                 "jean85/composer-provided-replaced-stub-package": "^1.0",
-                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan": "^2.0",
                 "phpunit/phpunit": "^7.5|^8.5|^9.6",
+                "rector/rector": "^2.0",
                 "vimeo/psalm": "^4.3 || ^5.0"
             },
             "type": "library",
@@ -806,9 +807,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Jean85/pretty-package-versions/issues",
-                "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.0"
+                "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.1"
             },
-            "time": "2024-11-18T16:19:46+00:00"
+            "time": "2025-03-19T14:43:43+00:00"
         },
         {
             "name": "league/csv",
@@ -8403,7 +8404,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

docker-compose.yml

@@ -171,6 +171,7 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -389,6 +390,8 @@ services:
       - _APP_DATABASE_SHARED_TABLES
       - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_EMAIL_CERTIFICATES
+      - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
 
   appwrite-worker-databases:
     entrypoint: worker-databases
@@ -721,6 +724,7 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_MAINTENANCE_DELAY

phpunit.xml

@@ -6,7 +6,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
+         stopOnFailure="true"
 >
     <extensions>
         <extension class="Appwrite\Tests\TestHook" />

src/Appwrite/Platform/Workers/Deletes.php

@@ -57,7 +57,7 @@ class Deletes extends Action
             ->inject('auditRetention')
             ->inject('log')
             ->callback(
-                fn ($message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, string $auditRetention, Log $log) =>
+                fn ($message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, array $auditRetention, Log $log) =>
                     $this->action($message, $project, $dbForPlatform, $getProjectDB, $getLogsDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $certificates, $executionRetention, $auditRetention, $log)
             );
     }
@@ -66,7 +66,7 @@ class Deletes extends Action
      * @throws Exception
      * @throws Throwable
      */
-    public function action(Message $message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, string $auditRetention, Log $log): void
+    public function action(Message $message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, array $auditRetention, Log $log): void
     {
         $payload = $message->getPayload() ?? [];
 
@@ -746,14 +746,14 @@ class Deletes extends Action
      * @return void
      * @throws Exception
      */
-    private function deleteAuditLogs(Document $project, callable $getProjectDB, string $auditRetention): void
+    private function deleteAuditLogs(Document $project, callable $getProjectDB, array $auditRetention): void
     {
         $projectId = $project->getId();
         $dbForProject = $getProjectDB($project);
 
         try {
             $this->deleteByGroup(Audit::COLLECTION, [
-                Query::lessThan('time', $auditRetention),
+                Query::lessThan('time', ($projectId === 'console' ? $auditRetention['console'] : $auditRetention['project'])),
                 Query::orderDesc('time'),
                 Query::orderDesc('$internalId'),
             ], $dbForProject);

tests/e2e/General/CompressionTest.php

@@ -74,7 +74,7 @@ class CompressionTest extends Scope
         ], $this->getHeaders()));
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertArrayHasKey('content-encoding', $response['headers'], 'Content encoding should be gzip, headers received: ' . json_encode($response['headers'], JSON_PRETTY_PRINT));
+        $this->assertArrayHasKey('content-encoding', $response['headers'], '`Content-Encoding` should be gzip, instead received response: ' . json_encode($response, JSON_PRETTY_PRINT));
         $this->assertLessThan(2000, intval($response['headers']['content-length']));
 
         // get prefs without compression
@@ -116,7 +116,7 @@ class CompressionTest extends Scope
         ]);
         $fileId = $file['body']['$id'];
 
-        // get image with header
+        // get image with accept header
         $response = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $bucketId . '/files/' . $fileId, array_merge([
             'content-type' => 'application/json',
             'accept-encoding' => 'gzip',
@@ -125,7 +125,8 @@ class CompressionTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertArrayNotHasKey('content-encoding', $response['headers']);
-        // get image without
+
+        // get image without accept header
         $response = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $bucketId . '/files/' . $fileId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],

tests/e2e/General/UsageTest.php

@@ -3,10 +3,8 @@
 namespace Tests\E2E\General;
 
 use Appwrite\Functions\Specification;
-use Appwrite\Tests\Retry;
 use CURLFile;
 use DateTime;
-use PHPUnit\Framework\ExpectationFailedException;
 use Tests\E2E\Client;
 use Tests\E2E\Scopes\ProjectCustom;
 use Tests\E2E\Scopes\Scope;
@@ -23,8 +21,8 @@ class UsageTest extends Scope
     use SideServer;
     use FunctionsBase;
 
-    private const WAIT = 5;
-    private const CREATE = 20;
+    private const WAIT = 5; //
+    private const RESOURCE_COUNT = 10; // Number of resources to create for each test
 
     protected string $projectId;
 
@@ -77,7 +75,7 @@ class UsageTest extends Scope
         $usersTotal = 0;
         $requestsTotal = 0;
 
-        for ($i = 0; $i < self::CREATE; $i++) {
+        for ($i = 0; $i < self::RESOURCE_COUNT; $i++) {
             $params = [
                 'userId' => 'unique()',
                 'email' => uniqid() . 'user@usage.test',
@@ -102,7 +100,7 @@ class UsageTest extends Scope
             $usersTotal += 1;
             $requestsTotal += 1;
 
-            if ($i < (self::CREATE / 2)) {
+            if ($i < (self::RESOURCE_COUNT / 2)) {
                 $userId = $response['body']['$id'];
 
                 $response = $this->client->call(
@@ -131,40 +129,43 @@ class UsageTest extends Scope
     /**
      * @depends testPrepareUsersStats
      */
-    #[Retry(count: 1)]
     public function testUsersStats(array $data): array
     {
         $requestsTotal = $data['requestsTotal'];
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/project/usage',
-            $this->getConsoleHeaders(),
-            [
-                'period' => '1h',
-                'startDate' => self::getToday(),
-                'endDate' => self::getTomorrow(),
-            ]
-        );
+        $this->assertEventually(function () use ($data) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/project/usage',
+                $this->getConsoleHeaders(),
+                [
+                    'period' => '1h',
+                    'startDate' => self::getToday(),
+                    'endDate' => self::getTomorrow(),
+                ]
+            );
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(31, count($response['body']));
-        $this->validateDates($response['body']['network']);
-        $this->validateDates($response['body']['requests']);
-        $this->validateDates($response['body']['users']);
-        $this->assertArrayHasKey('executionsBreakdown', $response['body']);
-        $this->assertArrayHasKey('bucketsBreakdown', $response['body']);
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals(31, count($response['body']));
+            $this->validateDates($response['body']['network']);
+            $this->validateDates($response['body']['requests']);
+            $this->validateDates($response['body']['users']);
+            $this->assertArrayHasKey('executionsBreakdown', $response['body']);
+            $this->assertArrayHasKey('bucketsBreakdown', $response['body']);
+        });
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/users/usage?range=90d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/users/usage?range=90d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals('90d', $response['body']['range']);
-        $this->assertEquals(90, count($response['body']['users']));
-        $this->assertEquals(90, count($response['body']['sessions']));
-        $this->assertEquals((self::CREATE / 2), $response['body']['users'][array_key_last($response['body']['users'])]['value']);
+            $this->assertEquals('90d', $response['body']['range']);
+            $this->assertEquals(90, count($response['body']['users']));
+            $this->assertEquals(90, count($response['body']['sessions']));
+            $this->assertEquals((self::RESOURCE_COUNT / 2), $response['body']['users'][array_key_last($response['body']['users'])]['value']);
+        });
 
         return array_merge($data, [
             'requestsTotal' => $requestsTotal
@@ -180,7 +181,7 @@ class UsageTest extends Scope
         $storageTotal = 0;
         $filesTotal = 0;
 
-        for ($i = 0; $i < self::CREATE; $i++) {
+        for ($i = 0; $i < self::RESOURCE_COUNT; $i++) {
             $name = uniqid() . ' bucket';
 
             $response = $this->client->call(
@@ -212,7 +213,7 @@ class UsageTest extends Scope
 
             $bucketId = $response['body']['$id'];
 
-            if ($i < (self::CREATE / 2)) {
+            if ($i < (self::RESOURCE_COUNT / 2)) {
                 $response = $this->client->call(
                     Client::METHOD_DELETE,
                     '/storage/buckets/' . $bucketId,
@@ -250,7 +251,7 @@ class UsageTest extends Scope
             ],
         ];
 
-        for ($i = 0; $i < self::CREATE; $i++) {
+        for ($i = 0; $i < self::RESOURCE_COUNT; $i++) {
             $file = $files[$i % count($files)];
 
             $response = $this->client->call(
@@ -277,7 +278,7 @@ class UsageTest extends Scope
 
             $fileId = $response['body']['$id'];
 
-            if ($i < (self::CREATE / 2)) {
+            if ($i < (self::RESOURCE_COUNT / 2)) {
                 $response = $this->client->call(
                     Client::METHOD_DELETE,
                     '/storage/buckets/' . $bucketId . '/files/' . $fileId,
@@ -307,7 +308,6 @@ class UsageTest extends Scope
     /**
      * @depends testPrepareStorageStats
      */
-    #[Retry(count: 10)]
     public function testStorageStats(array $data): array
     {
         $bucketId      = $data['bucketId'];
@@ -316,44 +316,50 @@ class UsageTest extends Scope
         $storageTotal  = $data['storageTotal'];
         $filesTotal    = $data['filesTotal'];
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/project/usage',
-            $this->getConsoleHeaders(),
-            [
-                'period' => '1d',
-                'startDate' => self::getToday(),
-                'endDate' => self::getTomorrow(),
-            ]
-        );
+        $this->assertEventually(function () use ($requestsTotal, $storageTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/project/usage',
+                $this->getConsoleHeaders(),
+                [
+                    'period' => '1d',
+                    'startDate' => self::getToday(),
+                    'endDate' => self::getTomorrow(),
+                ]
+            );
 
-        $this->assertEquals(31, count($response['body']));
-        $this->assertEquals(1, count($response['body']['requests']));
-        $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
-        $this->validateDates($response['body']['requests']);
-        $this->assertEquals($storageTotal, $response['body']['filesStorageTotal']);
+            $this->assertEquals(31, count($response['body']));
+            $this->assertEquals(1, count($response['body']['requests']));
+            $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
+            $this->validateDates($response['body']['requests']);
+            $this->assertEquals($storageTotal, $response['body']['filesStorageTotal']);
+        });
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/storage/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () use ($bucketsTotal, $storageTotal, $filesTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/storage/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
-        $this->validateDates($response['body']['storage']);
-        $this->assertEquals($bucketsTotal, $response['body']['buckets'][array_key_last($response['body']['buckets'])]['value']);
-        $this->validateDates($response['body']['buckets']);
-        $this->assertEquals($filesTotal, $response['body']['files'][array_key_last($response['body']['files'])]['value']);
-        $this->validateDates($response['body']['files']);
+            $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
+            $this->validateDates($response['body']['storage']);
+            $this->assertEquals($bucketsTotal, $response['body']['buckets'][array_key_last($response['body']['buckets'])]['value']);
+            $this->validateDates($response['body']['buckets']);
+            $this->assertEquals($filesTotal, $response['body']['files'][array_key_last($response['body']['files'])]['value']);
+            $this->validateDates($response['body']['files']);
+        });
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/storage/' . $bucketId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () use ($bucketId, $storageTotal, $filesTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/storage/' . $bucketId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
-        $this->assertEquals($filesTotal, $response['body']['files'][array_key_last($response['body']['files'])]['value']);
+            $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
+            $this->assertEquals($filesTotal, $response['body']['files'][array_key_last($response['body']['files'])]['value']);
+        });
 
         return $data;
     }
@@ -367,7 +373,7 @@ class UsageTest extends Scope
         $collectionsTotal = 0;
         $documentsTotal = 0;
 
-        for ($i = 0; $i < self::CREATE; $i++) {
+        for ($i = 0; $i < self::RESOURCE_COUNT; $i++) {
             $name = uniqid() . ' database';
 
             $response = $this->client->call(
@@ -391,7 +397,7 @@ class UsageTest extends Scope
 
             $databaseId = $response['body']['$id'];
 
-            if ($i < (self::CREATE / 2)) {
+            if ($i < (self::RESOURCE_COUNT / 2)) {
                 $response = $this->client->call(
                     Client::METHOD_DELETE,
                     '/databases/' . $databaseId,
@@ -407,7 +413,7 @@ class UsageTest extends Scope
             }
         }
 
-        for ($i = 0; $i < self::CREATE; $i++) {
+        for ($i = 0; $i < self::RESOURCE_COUNT; $i++) {
             $name = uniqid() . ' collection';
 
             $response = $this->client->call(
@@ -438,7 +444,7 @@ class UsageTest extends Scope
 
             $collectionId = $response['body']['$id'];
 
-            if ($i < (self::CREATE / 2)) {
+            if ($i < (self::RESOURCE_COUNT / 2)) {
                 $response = $this->client->call(
                     Client::METHOD_DELETE,
                     '/databases/' . $databaseId . '/collections/' . $collectionId,
@@ -474,7 +480,7 @@ class UsageTest extends Scope
 
         $requestsTotal += 1;
 
-        for ($i = 0; $i < self::CREATE; $i++) {
+        for ($i = 0; $i < self::RESOURCE_COUNT; $i++) {
             $name = uniqid() . ' collection';
 
             $response = $this->client->call(
@@ -498,7 +504,7 @@ class UsageTest extends Scope
 
             $documentId = $response['body']['$id'];
 
-            if ($i < (self::CREATE / 2)) {
+            if ($i < (self::RESOURCE_COUNT / 2)) {
                 $response = $this->client->call(
                     Client::METHOD_DELETE,
                     '/databases/' . $databaseId . '/collections/' . $collectionId . '/documents/' . $documentId,
@@ -525,7 +531,6 @@ class UsageTest extends Scope
     }
 
     /** @depends testPrepareDatabaseStats */
-    #[Retry(count: 1)]
     public function testDatabaseStats(array $data): array
     {
         $databaseId = $data['databaseId'];
@@ -535,60 +540,66 @@ class UsageTest extends Scope
         $collectionsTotal = $data['collectionsTotal'];
         $documentsTotal = $data['documentsTotal'];
 
-        sleep(self::WAIT);
+        $this->assertEventually(function () use ($requestsTotal, $databasesTotal, $documentsTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/project/usage',
+                $this->getConsoleHeaders(),
+                [
+                    'period' => '1d',
+                    'startDate' => self::getToday(),
+                    'endDate' => self::getTomorrow(),
+                ]
+            );
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/project/usage',
-            $this->getConsoleHeaders(),
-            [
-                'period' => '1d',
-                'startDate' => self::getToday(),
-                'endDate' => self::getTomorrow(),
-            ]
-        );
+            $this->assertEquals(31, count($response['body']));
+            $this->assertEquals(1, count($response['body']['requests']));
+            $this->assertEquals(1, count($response['body']['network']));
+            $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
+            $this->validateDates($response['body']['requests']);
+            $this->assertEquals($databasesTotal, $response['body']['databasesTotal']);
+            $this->assertEquals($documentsTotal, $response['body']['documentsTotal']);
+        });
 
-        $this->assertEquals(31, count($response['body']));
-        $this->assertEquals(1, count($response['body']['requests']));
-        $this->assertEquals(1, count($response['body']['network']));
-        $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
-        $this->validateDates($response['body']['requests']);
-        $this->assertEquals($databasesTotal, $response['body']['databasesTotal']);
-        $this->assertEquals($documentsTotal, $response['body']['documentsTotal']);
+        $this->assertEventually(function () use ($databasesTotal, $collectionsTotal, $documentsTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/databases/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/databases/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+            $this->assertEquals($databasesTotal, $response['body']['databases'][array_key_last($response['body']['databases'])]['value']);
+            $this->validateDates($response['body']['databases']);
+            $this->assertEquals($collectionsTotal, $response['body']['collections'][array_key_last($response['body']['collections'])]['value']);
+            $this->validateDates($response['body']['collections']);
+            $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
+            $this->validateDates($response['body']['documents']);
+        });
 
-        $this->assertEquals($databasesTotal, $response['body']['databases'][array_key_last($response['body']['databases'])]['value']);
-        $this->validateDates($response['body']['databases']);
-        $this->assertEquals($collectionsTotal, $response['body']['collections'][array_key_last($response['body']['collections'])]['value']);
-        $this->validateDates($response['body']['collections']);
-        $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
-        $this->validateDates($response['body']['documents']);
+        $this->assertEventually(function () use ($databaseId, $collectionsTotal, $documentsTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/databases/' . $databaseId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/databases/' . $databaseId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+            $this->assertEquals($collectionsTotal, $response['body']['collections'][array_key_last($response['body']['collections'])]['value']);
+            $this->validateDates($response['body']['collections']);
 
-        $this->assertEquals($collectionsTotal, $response['body']['collections'][array_key_last($response['body']['collections'])]['value']);
-        $this->validateDates($response['body']['collections']);
+            $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
+            $this->validateDates($response['body']['documents']);
+        });
 
-        $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
-        $this->validateDates($response['body']['documents']);
+        $this->assertEventually(function () use ($databaseId, $collectionId, $documentsTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/databases/' . $databaseId . '/collections/' . $collectionId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/databases/' . $databaseId . '/collections/' . $collectionId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
-
-        $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
-        $this->validateDates($response['body']['documents']);
+            $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
+            $this->validateDates($response['body']['documents']);
+        });
 
         return $data;
     }
@@ -1010,62 +1021,65 @@ class UsageTest extends Scope
     }
 
     /** @depends testPrepareFunctionsStats */
-    #[Retry(count: 1)]
     public function testFunctionsStats(array $data): array
     {
         $functionId = $data['functionId'];
         $executionTime = $data['executionTime'];
         $executions = $data['executions'];
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/functions/' . $functionId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () use ($functionId, $executionTime, $executions) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/functions/' . $functionId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(19, count($response['body']));
-        $this->assertEquals('30d', $response['body']['range']);
-        $this->assertIsArray($response['body']['deployments']);
-        $this->assertIsArray($response['body']['deploymentsStorage']);
-        $this->assertIsNumeric($response['body']['deploymentsStorageTotal']);
-        $this->assertIsNumeric($response['body']['buildsMbSecondsTotal']);
-        $this->assertIsNumeric($response['body']['executionsMbSecondsTotal']);
-        $this->assertIsArray($response['body']['builds']);
-        $this->assertIsArray($response['body']['buildsTime']);
-        $this->assertIsArray($response['body']['buildsMbSeconds']);
-        $this->assertIsArray($response['body']['executions']);
-        $this->assertIsArray($response['body']['executionsTime']);
-        $this->assertIsArray($response['body']['executionsMbSeconds']);
-        $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
-        $this->validateDates($response['body']['executions']);
-        $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
-        $this->validateDates($response['body']['executionsTime']);
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals(19, count($response['body']));
+            $this->assertEquals('30d', $response['body']['range']);
+            $this->assertIsArray($response['body']['deployments']);
+            $this->assertIsArray($response['body']['deploymentsStorage']);
+            $this->assertIsNumeric($response['body']['deploymentsStorageTotal']);
+            $this->assertIsNumeric($response['body']['buildsMbSecondsTotal']);
+            $this->assertIsNumeric($response['body']['executionsMbSecondsTotal']);
+            $this->assertIsArray($response['body']['builds']);
+            $this->assertIsArray($response['body']['buildsTime']);
+            $this->assertIsArray($response['body']['buildsMbSeconds']);
+            $this->assertIsArray($response['body']['executions']);
+            $this->assertIsArray($response['body']['executionsTime']);
+            $this->assertIsArray($response['body']['executionsMbSeconds']);
+            $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
+            $this->validateDates($response['body']['executions']);
+            $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
+            $this->validateDates($response['body']['executionsTime']);
+        });
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/functions/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () use ($executionTime, $executions) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/functions/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(21, count($response['body']));
-        $this->assertEquals($response['body']['range'], '30d');
-        $this->assertIsArray($response['body']['functions']);
-        $this->assertIsArray($response['body']['deployments']);
-        $this->assertIsArray($response['body']['deploymentsStorage']);
-        $this->assertIsArray($response['body']['builds']);
-        $this->assertIsArray($response['body']['buildsTime']);
-        $this->assertIsArray($response['body']['buildsMbSeconds']);
-        $this->assertIsArray($response['body']['executions']);
-        $this->assertIsArray($response['body']['executionsTime']);
-        $this->assertIsArray($response['body']['executionsMbSeconds']);
-        $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
-        $this->validateDates($response['body']['executions']);
-        $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
-        $this->validateDates($response['body']['executionsTime']);
-        $this->assertGreaterThan(0, $response['body']['buildsTime'][array_key_last($response['body']['buildsTime'])]['value']);
-        $this->validateDates($response['body']['buildsTime']);
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals(21, count($response['body']));
+            $this->assertEquals($response['body']['range'], '30d');
+            $this->assertIsArray($response['body']['functions']);
+            $this->assertIsArray($response['body']['deployments']);
+            $this->assertIsArray($response['body']['deploymentsStorage']);
+            $this->assertIsArray($response['body']['builds']);
+            $this->assertIsArray($response['body']['buildsTime']);
+            $this->assertIsArray($response['body']['buildsMbSeconds']);
+            $this->assertIsArray($response['body']['executions']);
+            $this->assertIsArray($response['body']['executionsTime']);
+            $this->assertIsArray($response['body']['executionsMbSeconds']);
+            $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
+            $this->validateDates($response['body']['executions']);
+            $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
+            $this->validateDates($response['body']['executionsTime']);
+            $this->assertGreaterThan(0, $response['body']['buildsTime'][array_key_last($response['body']['buildsTime'])]['value']);
+            $this->validateDates($response['body']['buildsTime']);
+        });
 
         return $data;
     }

tests/e2e/Services/Account/AccountCustomClientTest.php

@@ -1862,10 +1862,11 @@ class AccountCustomClientTest extends Scope
             'failure' => 'http://localhost/v1/mock/tests/general/oauth2/failure',
         ]);
 
-        $session = $response['cookies']['a_session_' . $this->getProject()['$id']];
-
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals('success', $response['body']['result']);
+        $this->assertArrayHasKey('a_session_' . $this->getProject()['$id'], $response['cookies']);
+
+        $session = $response['cookies']['a_session_' . $this->getProject()['$id']];
 
         $response = $this->client->call(Client::METHOD_GET, '/account', array_merge([
             'origin' => 'http://localhost',

tests/e2e/Services/Functions/FunctionsBase.php

@@ -46,7 +46,7 @@ trait FunctionsBase
                 'x-appwrite-key' => $this->getProject()['apiKey'],
             ]));
             $this->assertEquals('ready', $deployment['body']['status'], 'Deployment status is not ready, deployment: ' . json_encode($deployment['body'], JSON_PRETTY_PRINT));
-        }, 50000, 500);
+        }, 120000, 1000);
 
         return $deploymentId;
     }

tests/e2e/Services/Functions/FunctionsCustomServerTest.php

@@ -1926,7 +1926,7 @@ class FunctionsCustomServerTest extends Scope
             $this->assertEquals('completed', $execution['body']['status']);
             $this->assertEmpty($execution['body']['logs']);
             $this->assertEmpty($execution['body']['errors']);
-        }, 10000, 500);
+        }, 20000, 1000);
 
         // Domain Executions test
         $rules = $this->client->call(Client::METHOD_GET, '/proxy/rules', array_merge([

tests/e2e/Services/Storage/StorageCustomServerTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\E2E\Services\Storage;
 
+use Appwrite\Tests\Async;
 use Tests\E2E\Client;
 use Tests\E2E\Scopes\ProjectCustom;
 use Tests\E2E\Scopes\Scope;
@@ -16,6 +17,7 @@ class StorageCustomServerTest extends Scope
     use StorageBase;
     use ProjectCustom;
     use SideServer;
+    use Async;
 
     public function testCreateBucket(): array
     {
@@ -286,18 +288,21 @@ class StorageCustomServerTest extends Scope
         $this->assertEquals(204, $response['headers']['status-code']);
         $this->assertEmpty($response['body']);
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/storage/buckets/' . $id,
-            array_merge(
-                [
-                    'content-type' => 'application/json',
-                    'x-appwrite-project' => $this->getProject()['$id'],
-                ],
-                $this->getHeaders()
-            )
-        );
-        $this->assertEquals(404, $response['headers']['status-code']);
+        $this->assertEventually(function () use ($id) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/storage/buckets/' . $id,
+                array_merge(
+                    [
+                        'content-type' => 'application/json',
+                        'x-appwrite-project' => $this->getProject()['$id'],
+                    ],
+                    $this->getHeaders()
+                )
+            );
+
+            $this->assertEquals(404, $response['headers']['status-code']);
+        });
 
         return $data;
     }

tests/e2e/Services/Teams/TeamsBase.php

@@ -2,6 +2,7 @@
 
 namespace Tests\E2E\Services\Teams;
 
+use Appwrite\Tests\Async;
 use Tests\E2E\Client;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
@@ -10,6 +11,8 @@ use Utopia\Database\Validator\Datetime as DatetimeValidator;
 
 trait TeamsBase
 {
+    use Async;
+
     public function testCreateTeam(): array
     {
         /**
@@ -379,12 +382,15 @@ trait TeamsBase
         /**
          * Test for FAILURE
          */
-        $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()));
+        $this->assertEventually(function () use ($teamUid) {
+            $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid, array_merge([
+                'content-type' => 'application/json',
+                'x-appwrite-project' => $this->getProject()['$id'],
+            ], $this->getHeaders()));
+
+            $this->assertEquals(404, $response['headers']['status-code']);
+        });
 
-        $this->assertEquals(404, $response['headers']['status-code']);
 
         return [];
     }