Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
GEO_ENV=development
GEO_SECRET=geo-secret-key
GEO_LOGGING_PROVIDER=
GEO_LOGGING_CONFIG=
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ composer.phar
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock
test.http
.phpunit.result.cache
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"name": "appwrite/docker-geo",
"type": "project",
"require": {
"php": ">=8.3.0",
"php": ">=8.4",
"utopia-php/fetch": "0.5.*",
"utopia-php/http": "^2.0@RC",
"utopia-php/platform": "^1.0@RC",
"utopia-php/di": "0.3.*",
"utopia-php/system": "^0.10.1",
"utopia-php/logger": "^0.7.1",
"utopia-php/dsn": "^0.2.1",
"utopia-php/cli": "^0.24",
"utopia-php/console": "^0.1.1"
"utopia-php/console": "^0.1.1",
"utopia-php/span": "^4.2"
},
"autoload": {
"psr-4": {
Expand Down
204 changes: 148 additions & 56 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ services:
- GEO_ENV
- GEO_SECRET
- GEO_DBIP_PATH
- GEO_LOGGING_PROVIDER
- GEO_LOGGING_CONFIG

tests:
Expand Down
71 changes: 16 additions & 55 deletions src/Geo/Modules/Core/Http/Error.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
namespace Appwrite\Geo\Modules\Core\Http;

use Throwable;
use Utopia\Console;
use Utopia\Http\Http;
use Utopia\Http\Response;
use Utopia\Http\Route;
use Utopia\Logger\Log;
use Utopia\Logger\Logger;
use Utopia\Platform\Action;
use Utopia\Span\Span;
use Utopia\System\System;

class Error extends Action
Expand All @@ -27,14 +25,24 @@ public function __construct()
->groups(['*'])
->inject('route')
->inject('error')
->inject('logger')
->inject('response')
->callback(fn ($route, $error, $logger, $response) => $this->action($route, $error, $logger, $response));
->callback(fn ($route, $error, $response) => $this->action($route, $error, $response));
}

public function action(?Route $route, Throwable $error, ?Logger $logger, Response $response): void
public function action(?Route $route, Throwable $error, Response $response): void
{
$this->logError(new Log(), $error, "httpError", $logger, $route);
$span = Span::current() ?? Span::init('http.request');
$span->setError($error);

// Client errors stay on the span but are not exported
$span->set('error.publish', $error->getCode() >= 500 || $error->getCode() === 0);
$span->set('error.type', \get_class($error));
$span->set('error.code', $error->getCode());

if ($route) {
$span->set('http.method', $route->getMethod());
$span->set('http.path', $route->getPath());
}

$version = System::getEnv('GEO_VERSION', 'UNKNOWN');
$message = $error->getMessage();
Expand Down Expand Up @@ -81,54 +89,7 @@ public function action(?Route $route, Throwable $error, ?Logger $logger, Respons
->setStatusCode($code);

$response->json($output);
}

protected function logError(Log $log, Throwable $error, string $action, ?Logger $logger = null, ?Route $route = null): void
{
$code = $error->getCode();
$isServerError = $code >= 500 || $code === 0;

if ($isServerError) {
Console::error('[Error] Type: ' . get_class($error));
Console::error('[Error] Message: ' . $error->getMessage());
Console::error('[Error] File: ' . $error->getFile());
Console::error('[Error] Line: ' . $error->getLine());
}

if ($logger && $isServerError) {
$version = (string) System::getEnv('GEO_VERSION', '');
if (empty($version)) {
$version = 'UNKNOWN';
}

$log->setNamespace("geo");
$log->setServer(\gethostname() !== false ? \gethostname() : null);
$log->setVersion($version);
$log->setType(Log::TYPE_ERROR);
$log->setMessage($error->getMessage());

if ($route) {
$log->addTag('method', $route->getMethod());
$log->addTag('url', $route->getPath());
}

$log->addTag('code', \strval($error->getCode()));
$log->addTag('verboseType', get_class($error));

$log->addExtra('file', $error->getFile());
$log->addExtra('line', $error->getLine());
$log->addExtra('trace', $error->getTraceAsString());

$log->setAction($action);

$log->setEnvironment(Http::isProduction() ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
try {
$responseCode = $logger->addLog($log);
Console::info('Geo log pushed with status code: ' . $responseCode);
} catch (Throwable $th) {
Console::error('Error pushing log: ' . $th->getMessage());
Console::error($th->getTraceAsString());
}
}
$span->finish();
}
}
Loading
Loading