src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php (1)

145-145: Remove unused $usage from closure capture.

$usage is captured in the withTransaction closure but not used there.

♻️ Optional cleanup

-                $dbForProject->withTransaction(function () use ($dbForProject, $transactionState, $queueForDeletes, $transactionId, &$transaction, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $queueForEvents, $usage, $queueForRealtime, $queueForFunctions, $queueForWebhooks, $authorization) {
+                $dbForProject->withTransaction(function () use ($dbForProject, $transactionState, $queueForDeletes, $transactionId, &$transaction, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $queueForEvents, $queueForRealtime, $queueForFunctions, $queueForWebhooks, $authorization) {

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In
`@src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php`
at line 145, The closure passed to $dbForProject->withTransaction in Update.php
unnecessarily captures $usage; remove $usage from the closure's use(...) capture
list in the withTransaction call (the anonymous function starting with function
() use ($dbForProject, $transactionState, ...)) so the closure only captures
variables it actually uses, and run a quick search for $usage inside that
closure to confirm it isn't referenced before committing the change.

src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php (1)

102-102: Consider removing unused $timelimit and $plan from this action signature.

They are currently injected but not referenced, which adds avoidable noise to the endpoint contract.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php` at line 102,
The action method signature for Memberships::action currently includes unused
parameters $timelimit and $plan; remove these two parameters from the
action(string $teamId, ...) signature in Create::action to keep the endpoint
contract minimal, and update any docblocks and unit tests referencing
Create::action; also search for any caller or DI/invocation sites that pass
$timelimit or $plan to Create::action and adjust those calls to no longer supply
them so the parameter removal stays consistent.

app/controllers/shared/api.php (1)

964-988: ⚠️ Potential issue | 🟠 Major

Usage publishing still bypasses _APP_USAGE_STATS in API shutdown.

This same issue persists: Line 995 checks the usage route group, but Line 964-Line 988 publish usage from the general api shutdown path without checking the global usage flag.

🔧 Proposed fix

-            // Publish usage metrics if context has data
-            if (!$usage->isEmpty()) {
+            $usageStatsEnabled = System::getEnv('_APP_USAGE_STATS', 'enabled') === 'enabled';
+            // Publish usage metrics only when enabled and context has data
+            if ($usageStatsEnabled && !$usage->isEmpty()) {
                 $metrics = $usage->getMetrics();

                 // Filter out API key disabled metrics using suffix pattern matching
                 $disabledMetrics = $apiKey?->getDisabledMetrics() ?? [];
                 if (!empty($disabledMetrics)) {
@@
                         return true;
                     }));
                 }
+
+                if (empty($metrics) && empty($usage->getReduce())) {
+                    return;
+                }

                 $message = new \Appwrite\Event\Message\Usage(
                     project: $project,
                     metrics: $metrics,
                     reduce: $usage->getReduce()
                 );

                 $publisherForUsage->enqueue($message);
             }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@app/controllers/shared/api.php` around lines 964 - 988, The shutdown path
publishes usage metrics regardless of the global usage toggle; update the block
that builds and enqueues the Usage message (references: $usage,
$usage->isEmpty(), $usage->getMetrics(), $usage->getReduce(),
$apiKey?->getDisabledMetrics(), $publisherForUsage->enqueue) to first check the
global flag (e.g. _APP_USAGE_STATS or the existing configuration getter used
elsewhere for the "usage" route) and skip building/enqueueing when usage
publishing is disabled; ensure the same feature-flag check used in the `usage`
route group is applied here before filtering metrics and creating the
\Appwrite\Event\Message\Usage message.

src/Appwrite/Platform/Workers/Migrations.php (1)

107-108: ⚠️ Potential issue | 🔴 Critical

Critical: $publisherForUsage not propagated through the call chain.

The $publisherForUsage parameter is received in action() (line 108) but is never passed to processMigration() (lines 148-155), which in turn doesn't pass it to processMigrationResourceStats() (line 798). However, line 853 attempts to use $publisherForUsage->enqueue($message), which will cause a fatal "undefined variable" error when completed migrations attempt to publish usage statistics.

Required fix to propagate $publisherForUsage

             $this->processMigration(
                 $migration,
                 $queueForRealtime,
                 $queueForMails,
                 $usage,
+                $publisherForUsage,
                 $platform,
                 $authorization
             );
@@
     protected function processMigration(
         Document $migration,
         Realtime $queueForRealtime,
         Mail $queueForMails,
         Context $usage,
+        \Appwrite\Event\Publisher\Usage $publisherForUsage,
         array $platform,
         Authorization $authorization,
     ): void {
@@
                         $this->processMigrationResourceStats(
                             $resource,
                             $usage,
                             $project,
                             $migration->getAttribute('source'),
                             $authorization,
-                            $migration->getAttribute('resourceId')
+                            $migration->getAttribute('resourceId'),
+                            $publisherForUsage
                         );
@@
-    private function processMigrationResourceStats(array $resources, Context $usage, Document $projectDocument, string $source, Authorization $authorization, ?string $resourceId)
+    private function processMigrationResourceStats(array $resources, Context $usage, Document $projectDocument, string $source, Authorization $authorization, ?string $resourceId, \Appwrite\Event\Publisher\Usage $publisherForUsage): void

Also applies to: 148-155, 340-340, 798-798, 848-854

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Appwrite/Platform/Workers/Migrations.php` around lines 107 - 108, The
$publisherForUsage parameter passed into action() is not forwarded and thus is
undefined where used; update the call chain to accept and propagate this
dependency: add a $publisherForUsage parameter to processMigration() and any
intermediate callers (and signatures that currently call processMigration()),
and then pass that same $publisherForUsage into processMigrationResourceStats();
finally ensure processMigrationResourceStats() signature accepts and uses
$publisherForUsage when calling ->enqueue($message). Update all affected
function signatures and call sites (action(), processMigration(),
processMigrationResourceStats() and any callers) to include and forward
$publisherForUsage.

src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php (1)

411-414: ⚠️ Potential issue | 🔴 Critical

Remove invalid method chain on Context usage accumulator.

Line 413 and Line 414 call methods that do not belong to Appwrite\Usage\Context, which will fatal on the phone-invite flow.

Proposed fix

                 $usage
-                    ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
-                    ->setProject($project)
-                    ->trigger();
+                    ->addMetric(METRIC_AUTH_METHOD_PHONE, 1);

#!/bin/bash
set -euo pipefail

echo "=== Context API surface ==="
rg -n --type=php 'function (addMetric|setProject|trigger)\(' src/Appwrite/Usage/Context.php

echo
echo "=== Usage chain in memberships create ==="
sed -n '405,416p' src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php | cat -n

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php` around lines
411 - 414, The chain on the Context accumulator
($usage->addMetric(...)->setProject(...)->trigger()) is invalid because
Appwrite\Usage\Context does not implement setProject or trigger; remove the
chained calls and only call the methods that exist on the Context instance
(e.g., call $usage->addMetric(METRIC_AUTH_METHOD_PHONE, 1);). If you need to set
the project or trigger processing, invoke those operations using the correct
API/instance that exposes setProject/trigger (consult Appwrite\Usage\Context
class for the proper methods) rather than chaining them off $usage.

src/Appwrite/Platform/Workers/Messaging.php (1)

311-323: ⚠️ Potential issue | 🔴 Critical

Context is used with removed publish APIs (setProject/trigger) and can fatal at runtime.

Line 312 and Line 322 call methods that are not part of the new accumulator-style Appwrite\Usage\Context. This external-send path will break when executed. Keep this block to metric accumulation only, then publish via Appwrite\Event\Publisher\Usage + Appwrite\Event\Message\Usage at worker completion.

Suggested refactor direction

- $usage
-     ->setProject($project)
-     ->addMetric(...)
-     ...
-     ->trigger();
+ $usage
+     ->addMetric(...)
+     ...
+ ;
+
+ // after processing (once):
+ // $publisherForUsage->enqueue(new UsageMessage(
+ //     project: $project,
+ //     metrics: $usage->getMetrics(),
+ //     reduce: $usage->getReduce()
+ // ));
+ // $usage->reset();

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Appwrite/Platform/Workers/Messaging.php` around lines 311 - 323, The
block using $usage currently calls removed publish APIs setProject() and
trigger()—remove those calls and keep only the accumulation of metrics on $usage
(the addMetric(...) calls that reference METRIC_MESSAGES, METRIC_MESSAGES_SENT,
METRIC_MESSAGES_FAILED, METRIC_MESSAGES_TYPE*, METRIC_MESSAGES_TYPE_PROVIDER*
and use $provider->getAttribute('type') and ->getAttribute('provider') as well
as $deliveredTotal/$errorTotal); then ensure publishing is done later at worker
completion via the new publisher APIs Appwrite\Event\Publisher\Usage and
Appwrite\Event\Message\Usage (i.e. stop calling ->setProject(...) and
->trigger() here and move publication to the worker teardown using the Usage
publishers).

app/init/resources.php (1)

154-159: ⚠️ Potential issue | 🟠 Major

Use consistent queue driver for publisherForUsage.

The Queue constructor at line 156 is missing the 'utopia-queue' driver parameter. Based on past review comments, both app/worker.php and app/cli.php instantiate the same resource with 'utopia-queue', which could cause usage messages to be published to a different backend than the workers consume from.

Suggested fix

 Http::setResource('publisherForUsage', function (Publisher $publisher) {
     $queueName = System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME);
-    $queue = new \Utopia\Queue\Queue($queueName);
+    $queue = new \Utopia\Queue\Queue($queueName, 'utopia-queue');
 
     return new \Appwrite\Event\Publisher\Usage($publisher, $queue);
 }, ['publisher']);

,

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@app/init/resources.php` around lines 154 - 159, The publisherForUsage
resource constructs a Queue without the driver, causing inconsistent backends;
update the factory that returns new \Appwrite\Event\Publisher\Usage in
publisherForUsage so the \Utopia\Queue\Queue is instantiated with the explicit
'utopia-queue' driver (i.e. pass the driver as the second argument to the Queue
constructor) so the Usage publisher uses the same queue driver as app/worker.php
and app/cli.php.

src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php (1)

416-419: ⚠️ Potential issue | 🔴 Critical

Context has no setProject() or trigger() methods—this will cause a fatal error at runtime.

The code still calls undefined methods on the Context instance. Per the new pattern, only addMetric() should be called. The publishing is handled separately by the shutdown hook via Publisher\Usage.

Proposed fix

-                $usage
-                    ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
-                    ->setProject($project)
-                    ->trigger();
+                $usage
+                    ->addMetric(METRIC_AUTH_METHOD_PHONE, 1);

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php` around lines
416 - 419, The code is calling undefined methods setProject() and trigger() on
the $usage Context instance; remove those calls and only call
$usage->addMetric(METRIC_AUTH_METHOD_PHONE, 1) so the Context usage metric is
recorded and publishing is left to the shutdown hook (Publisher\Usage). Update
the block around $usage (the Context instance used for usage metrics in
Create.php) to stop chaining setProject() and trigger(), leaving a single
addMetric(...) call.

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php (1)

77-84: ⚠️ Potential issue | 🟡 Minor

Remove the dead $user dependency from this action.

Document $user is still unused after the usage-context swap, so ->inject('user') just widens the signature and keeps PHPMD unhappy.

🧹 Suggested cleanup

-            ->inject('user')
             ->inject('usage')
@@
-    public function action(string $databaseId, string $collectionId, array $queries, ?string $transactionId, bool $includeTotal, int $ttl, UtopiaResponse $response, Database $dbForProject, Document $user, Context $usage, TransactionState $transactionState, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, array $queries, ?string $transactionId, bool $includeTotal, int $ttl, UtopiaResponse $response, Database $dbForProject, Context $usage, TransactionState $transactionState, Authorization $authorization): void

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In
`@src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php`
around lines 77 - 84, Remove the dead user dependency: delete the
->inject('user') call from the collection setup and remove the unused Document
$user parameter from the action method signature (public function action(...,
Context $usage, TransactionState $transactionState, Authorization
$authorization): void) and any corresponding references, so the action no longer
accepts or expects a user object and PHPMD warnings are resolved.

src/Appwrite/Platform/Workers/Migrations.php (1)

148-155: ⚠️ Potential issue | 🔴 Critical

Pass the usage publisher through this call chain.

action() now receives $publisherForUsage, but this call still drops it. The completed-migration path later does $publisherForUsage->enqueue(...) out of scope in processMigrationResourceStats(), so successful migrations will crash as soon as they try to publish usage stats.

🛠️ Proposed fix

             $this->processMigration(
                 $migration,
                 $queueForRealtime,
                 $queueForMails,
                 $usage,
+                $publisherForUsage,
                 $platform,
                 $authorization
             );
@@
     protected function processMigration(
         Document $migration,
         Realtime $queueForRealtime,
         Mail $queueForMails,
         Context $usage,
+        \Appwrite\Event\Publisher\Usage $publisherForUsage,
         array $platform,
         Authorization $authorization,
     ): void {
@@
                         $this->processMigrationResourceStats(
                             $resource,
                             $usage,
                             $project,
                             $migration->getAttribute('source'),
                             $authorization,
-                            $migration->getAttribute('resourceId')
+                            $migration->getAttribute('resourceId'),
+                            $publisherForUsage
                         );
@@
-    private function processMigrationResourceStats(array $resources, Context $usage, Document $projectDocument, string $source, Authorization $authorization, ?string $resourceId)
+    private function processMigrationResourceStats(
+        array $resources,
+        Context $usage,
+        Document $projectDocument,
+        string $source,
+        Authorization $authorization,
+        ?string $resourceId,
+        \Appwrite\Event\Publisher\Usage $publisherForUsage,
+    ): void

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Appwrite/Platform/Workers/Migrations.php` around lines 148 - 155, The
call to processMigration is not forwarding the new $publisherForUsage, causing
action() to receive no publisher and later processMigrationResourceStats() to
call $publisherForUsage->enqueue(...) on null; update the processMigration(...)
invocation to include the $publisherForUsage argument and then propagate that
parameter through processMigration's signature and any internal calls to
action(), ensuring action() and processMigrationResourceStats() receive and use
the same $publisherForUsage variable.

src/Appwrite/Platform/Workers/Messaging.php (1)

311-323: ⚠️ Potential issue | 🔴 Critical

Replace the old self-publishing usage API here.

This block still treats Context like StatsUsage. In the new design, Context is only an accumulator, so setProject() / trigger() are no longer the right API. This path will fail at runtime unless it builds a \Appwrite\Event\Message\Usage and enqueues it through \Appwrite\Event\Publisher\Usage.

🛠️ Proposed fix

-            ->inject('usage')
+            ->inject('usage')
+            ->inject('publisherForUsage')
             ->callback($this->action(...));
@@
-        Device $deviceForFiles,
-        Context $usage
+        Device $deviceForFiles,
+        Context $usage,
+        \Appwrite\Event\Publisher\Usage $publisherForUsage
     ): void {
@@
-                    $this->sendExternalMessage($dbForProject, $message, $deviceForFiles, $project, $usage);
+                    $this->sendExternalMessage($dbForProject, $message, $deviceForFiles, $project, $usage, $publisherForUsage);
@@
-        Document $project,
-        Context $usage
+        Document $project,
+        Context $usage,
+        \Appwrite\Event\Publisher\Usage $publisherForUsage
     ): void {
@@
-                            $usage
-                                ->setProject($project)
-                                ->addMetric(METRIC_MESSAGES, ($deliveredTotal + $errorTotal))
+                            $usage
+                                ->addMetric(METRIC_MESSAGES, ($deliveredTotal + $errorTotal))
                                 ->addMetric(METRIC_MESSAGES_SENT, $deliveredTotal)
                                 ->addMetric(METRIC_MESSAGES_FAILED, $errorTotal)
                                 ->addMetric(str_replace('{type}', $provider->getAttribute('type'), METRIC_MESSAGES_TYPE), ($deliveredTotal + $errorTotal))
                                 ->addMetric(str_replace('{type}', $provider->getAttribute('type'), METRIC_MESSAGES_TYPE_SENT), $deliveredTotal)
                                 ->addMetric(str_replace('{type}', $provider->getAttribute('type'), METRIC_MESSAGES_TYPE_FAILED), $errorTotal)
                                 ->addMetric(str_replace(['{type}', '{provider}'], [$provider->getAttribute('type'), $provider->getAttribute('provider')], METRIC_MESSAGES_TYPE_PROVIDER), ($deliveredTotal + $errorTotal))
                                 ->addMetric(str_replace(['{type}', '{provider}'], [$provider->getAttribute('type'), $provider->getAttribute('provider')], METRIC_MESSAGES_TYPE_PROVIDER_SENT), $deliveredTotal)
-                                ->addMetric(str_replace(['{type}', '{provider}'], [$provider->getAttribute('type'), $provider->getAttribute('provider')], METRIC_MESSAGES_TYPE_PROVIDER_FAILED), $errorTotal)
-                                ->trigger();
+                                ->addMetric(str_replace(['{type}', '{provider}'], [$provider->getAttribute('type'), $provider->getAttribute('provider')], METRIC_MESSAGES_TYPE_PROVIDER_FAILED), $errorTotal);
+
+                            $publisherForUsage->enqueue(new \Appwrite\Event\Message\Usage(
+                                project: $project,
+                                metrics: $usage->getMetrics(),
+                                reduce: $usage->getReduce(),
+                            ));
+                            $usage->reset();

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Appwrite/Platform/Workers/Messaging.php` around lines 311 - 323, The
current block is still using the old StatsUsage API (calling setProject() and
trigger() on the Context/usage object) which is invalid with the new
Context-as-accumulator design; replace this by constructing a
\Appwrite\Event\Message\Usage instance populated with project, metrics
(METRIC_MESSAGES, METRIC_MESSAGES_SENT, METRIC_MESSAGES_FAILED, the type- and
provider-scoped metrics) and totals (use $deliveredTotal/$errorTotal), then
enqueue that message via \Appwrite\Event\Publisher\Usage instead of calling
setProject()/trigger() on the Context/usage object; update the code that
references setProject(), trigger(), and $usage to use the new Usage message and
Publisher API.

src/Appwrite/Platform/Workers/Webhooks.php (1)

38-39: ⚠️ Potential issue | 🔴 Critical

Context still uses the removed self-publishing API here.

setProject() / trigger() do not belong to the new accumulator, so this will fatal on webhook delivery. Also, action() reuses the same $usage across multiple matching webhooks, so publish once from action() via publisherForUsage before the final exception check, or reset after each enqueue to avoid double-counting.

🔧 One safe way to apply the new pattern

+use Appwrite\Event\Message\Usage as UsageMessage;
+use Appwrite\Event\Publisher\Usage as UsagePublisher;
 use Appwrite\Usage\Context;
@@
-            ->inject('usage')
+            ->inject('publisherForUsage')
+            ->inject('usage')
             ->inject('log')
             ->inject('plan')
             ->callback($this->action(...));
@@
-    public function action(Message $message, Document $project, Database $dbForPlatform, Mail $queueForMails, Context $usage, Log $log, array $plan): void
+    public function action(Message $message, Document $project, Database $dbForPlatform, Mail $queueForMails, UsagePublisher $publisherForUsage, Context $usage, Log $log, array $plan): void
     {
         $this->errors = [];
@@
         foreach ($project->getAttribute('webhooks', []) as $webhook) {
             if (array_intersect($webhook->getAttribute('events', []), $events)) {
                 $this->execute($events, $webhookPayload, $webhook, $user, $project, $dbForPlatform, $queueForMails, $usage, $plan);
             }
         }
+
+        if ($usage->getMetrics() !== []) {
+            $publisherForUsage->enqueue(new UsageMessage(
+                project: $project,
+                metrics: $usage->getMetrics(),
+                reduce: $usage->getReduce(),
+            ));
+            $usage->reset();
+        }
 
         if (!empty($this->errors)) {
             throw new Exception(\implode(" / \n\n", $this->errors));
         }
@@
-        $usage
-            ->setProject($project)
-            ->trigger();
     }

#!/bin/bash
set -euo pipefail

echo "[Context API]"
rg -n --type=php 'function\s+(addMetric|addReduce|getMetrics|getReduce|reset|setProject|trigger)\b' src/Appwrite/Usage/Context.php

echo
echo "[Current Webhooks calls that should disappear]"
rg -n --type=php '\->(setProject|trigger)\(' src/Appwrite/Platform/Workers/Webhooks.php

echo
echo "[Current usage publisher pattern elsewhere in the repo]"
rg -n --type=php 'publisherForUsage|new UsageMessage|->enqueue\(' app src/Appwrite | sed -n '1,120p'

Expected result: Context.php should expose accumulator methods like addMetric, getMetrics, getReduce, and reset, not setProject / trigger; Webhooks.php should stop matching the second grep after the fix.

Also applies to: 55-55, 200-202

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Appwrite/Platform/Workers/Webhooks.php` around lines 38 - 39, The
Webhooks worker still calls the removed Context self-publishing API methods
(setProject, trigger) and reuses the same $usage accumulator across multiple
matching webhooks causing double-counting; update Webhooks.php to stop calling
Context::setProject and Context::trigger and instead use the new accumulator
methods (e.g., addMetric, getMetrics, getReduce, reset) on the Context/usage
object, and ensure publishing happens once per webhook action by invoking
publisherForUsage (or creating a new UsageMessage and enqueue) from action()
before the final exception check or by resetting $usage after each enqueue to
avoid reuse; locate references to setProject, trigger, action,
publisherForUsage, and $usage in the file and replace with the new accumulator
and publish pattern accordingly.

tests/e2e/General/UsageTest.php (1)

188-188: ⚠️ Potential issue | 🟠 Major

Update the stale #[Depends] targets to the renamed snake_case tests.

These attributes still point at the old camelCase method names, so PHPUnit will not resolve the dependency chain for the renamed tests.

🔧 Example fix pattern

-    #[Depends('testPrepareUsersStats')]
+    #[Depends('test_prepare_users_stats')]
     public function test_users_stats(array $data): array

-    #[Depends('testPrepareStorageStats')]
+    #[Depends('test_prepare_storage_stats')]
     public function test_storage_stats(array $data): array

-    #[Depends('testFunctionsStats')]
+    #[Depends('test_functions_stats')]
     public function test_custom_domains_function_stats(array $data): void

Apply the same snake_case rename to the remaining #[Depends] strings in this file.

#!/bin/bash
set -euo pipefail

# Verify that every #[Depends('...')] target exists as a declared method name.
python - <<'PY'
import pathlib, re

path = pathlib.Path("tests/e2e/General/UsageTest.php")
text = path.read_text()

methods = set(re.findall(r'public function (\w+)\s*\(', text))
pairs = re.findall(r"#\[Depends\('([^']+)'\)\]\s*public function (\w+)", text, re.S)

for dep, owner in pairs:
    status = "OK" if dep in methods else "MISSING"
    print(f"{owner}: depends on {dep} -> {status}")
PY

Expected result: every dependency reports -> OK.

Also applies to: 232-232, 365-365, 422-422, 597-597, 671-671, 852-852, 931-931, 1095-1095, 1233-1233, 1309-1309

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@tests/e2e/General/UsageTest.php` at line 188, Update stale PHPUnit dependency
attributes: replace camelCase Depends targets with the renamed snake_case test
method names. Find occurrences like #[Depends('testPrepareUsersStats')] and
change the string to the actual declared method name (e.g.
test_prepare_users_stats) so PHPUnit can resolve dependencies; do the same for
all other #[Depends('...')] entries in this file that still reference camelCase
names, ensuring each Depends target exactly matches the corresponding public
function method name.

app/init/resources.php (1)

154-158: ⚠️ Potential issue | 🟠 Major

Pass the explicit queue driver into publisherForUsage.

Line 156 is still constructing the usage queue without the explicit 'utopia-queue' driver. If the worker/CLI side uses a driver-qualified queue, this publisher can write usage messages to a different backend than the consumers read from.

Suggested fix

 Http::setResource('publisherForUsage', function (Publisher $publisher) {
     $queueName = System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME);
-    $queue = new \Utopia\Queue\Queue($queueName);
+    $queue = new \Utopia\Queue\Queue($queueName, 'utopia-queue');
 
     return new \Appwrite\Event\Publisher\Usage($publisher, $queue);
 }, ['publisher']);

Verify that the usage queue is constructed consistently everywhere; expect app/cli.php and app/worker.php to pass 'utopia-queue' explicitly while this factory does not.

#!/bin/bash
set -euo pipefail

echo "=== publisherForUsage factory ==="
sed -n '151,159p' app/init/resources.php

echo
echo "=== usage queue constructions across app/ ==="
rg -n "STATS_USAGE_QUEUE_NAME|new \\\\Utopia\\\\Queue\\\\Queue\\(" app -C2

echo
echo "=== usage publisher implementation ==="
sed -n '1,160p' src/Appwrite/Event/Publisher/Usage.php

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@app/init/resources.php` around lines 154 - 158, The publisherForUsage factory
currently constructs the queue with new \Utopia\Queue\Queue($queueName) which
omits the explicit driver; update the Http::setResource('publisherForUsage')
factory to construct the queue with the explicit 'utopia-queue' driver (e.g.
pass the driver argument when creating \Utopia\Queue\Queue) so the returned new
\Appwrite\Event\Publisher\Usage($publisher, $queue) writes to the same backend
as the workers; mirror the same construction used in app/cli.php and
app/worker.php to ensure consistency.

src/Appwrite/Platform/Modules/Databases/Http/Databases/Delete.php (1)

63-64: Drop the unused usage injection here.

action() never accepts a Context, so this route resolves a dependency it does not consume. Either wire Context $usage into the callback or remove the injection; right now this reads like an incomplete migration.

♻️ Suggested cleanup

-            ->inject('usage')
             ->callback($this->action(...));

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/Appwrite/Platform/Modules/Databases/Http/Databases/Delete.php` around
lines 63 - 64, The route definition is injecting 'usage' but the handler method
action() does not accept a Context or any parameter, so remove the unnecessary
injection to avoid resolving an unused dependency; locate the route builder call
that chains ->inject('usage') and ->callback($this->action(...)) and delete the
->inject('usage') call (or alternatively update the action method signature to
accept Context $usage if you intend to use it), ensuring the callback and
injection match.

app/controllers/shared/api.php (1)

971-996: Skip enqueueing when API-key filtering removes every metric.

After the suffix filter, $metrics can be empty even though $usage was not. Enqueuing an empty usage message just adds avoidable queue work at shutdown.

Proposed fix

-                $message = new \Appwrite\Event\Message\Usage(
-                    project: $project,
-                    metrics: $metrics,
-                    reduce: $usage->getReduce()
-                );
-
-                $publisherForUsage->enqueue($message);
+                if (! empty($metrics)) {
+                    $message = new \Appwrite\Event\Message\Usage(
+                        project: $project,
+                        metrics: $metrics,
+                        reduce: $usage->getReduce()
+                    );
+
+                    $publisherForUsage->enqueue($message);
+                }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@app/controllers/shared/api.php` around lines 971 - 996, After filtering out
disabled metrics, $metrics may become empty and you should avoid
creating/enqueueing an empty usage message; update the block handling $usage
(use symbols $metrics, $usage, $disabledMetrics, str_ends_with,
\Appwrite\Event\Message\Usage, and $publisherForUsage->enqueue) to check if
array is non-empty after the suffix filtering and only construct the Usage
message and call $publisherForUsage->enqueue when $metrics is not empty.