diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 9655b768c..a8d5f20ce 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -18,7 +18,7 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e /** @var Utopia\Registry\Registry $register */ /** @var Appwrite\Event\Event $events */ /** @var Appwrite\Event\Event $audits */ - /** @var Appwrite\Statsd\Statsd $usage */ + /** @var Appwrite\Stats\Stats $usage */ /** @var Appwrite\Event\Event $deletes */ /** @var Appwrite\Event\Event $database */ /** @var Appwrite\Event\Event $functions */ @@ -176,7 +176,7 @@ App::shutdown(function ($utopia, $request, $response, $project, $register, $even /** @var Utopia\Database\Document $project */ /** @var Appwrite\Event\Event $events */ /** @var Appwrite\Event\Event $audits */ - /** @var Appwrite\Statsd\Statsd $usage */ + /** @var Appwrite\Stats\Stats $usage */ /** @var Appwrite\Event\Event $deletes */ /** @var Appwrite\Event\Event $database */ /** @var Appwrite\Event\Event $functions */ @@ -222,7 +222,7 @@ App::shutdown(function ($utopia, $request, $response, $project, $register, $even $usage ->setParam('networkRequestSize', $request->getSize() + $usage->getParam('storage')) ->setParam('networkResponseSize', $response->getSize()) - ->save() + ->submit() ; } diff --git a/app/init.php b/app/init.php index bb5278445..5c20816e4 100644 --- a/app/init.php +++ b/app/init.php @@ -249,6 +249,7 @@ $register->set('statsd', function () { // Register DB connection return $statsd; }); + $register->set('smtp', function () { $mail = new PHPMailer(true); diff --git a/app/workers/functions.php b/app/workers/functions.php index 75dc3ca5e..1b36b7cdc 100644 --- a/app/workers/functions.php +++ b/app/workers/functions.php @@ -2,7 +2,7 @@ use Appwrite\Event\Event; use Appwrite\Resque\Worker; -use Appwrite\Statsd\Statsd; +use Appwrite\Stats\Stats; use Appwrite\Utopia\Response\Model\Execution; use Cron\CronExpression; use Swoole\Runtime; @@ -480,7 +480,7 @@ class FunctionsV1 extends Worker if(App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') { $statsd = $register->get('statsd'); - $usage = new Statsd($statsd); + $usage = new Stats($statsd); $usage ->setParam('projectId', $projectId) @@ -490,7 +490,7 @@ class FunctionsV1 extends Worker ->setParam('functionExecutionTime', $executionTime * 1000) // ms ->setParam('networkRequestSize', 0) ->setParam('networkResponseSize', 0) - ->save() + ->submit() ; } diff --git a/src/Appwrite/Statsd/Statsd.php b/src/Appwrite/Stats/Stats.php similarity index 89% rename from src/Appwrite/Statsd/Statsd.php rename to src/Appwrite/Stats/Stats.php index e1fdbc46e..4b9eddf85 100644 --- a/src/Appwrite/Statsd/Statsd.php +++ b/src/Appwrite/Stats/Stats.php @@ -1,10 +1,10 @@ params[$key])) ? $this->params[$key] : null; + } + /** * Submit data to StatsD. */ - public function save(): void + public function submit(): void { $projectId = $this->params['projectId'] ?? '';