Merge pull request #28 from open-runtimes/0.1.x

0.1.x to main
open-runtimes · Aug 8, 2023 · 5c7fba6 · 5c7fba6
2 parents b5a65a8 + 76c2724
commit 5c7fba6
Show file tree

Hide file tree

Showing 2 changed files with 139 additions and 122 deletions.
diff --git a/app/http.php b/app/http.php
@@ -53,8 +53,8 @@
 $register = new Registry();
 
 /**
-* Create logger for cloud logging
-*/
+ * Create logger for cloud logging
+ */
 $register->set('logger', function () {
     $providerName = App::getEnv('OPR_EXECUTOR_LOGGING_PROVIDER', '');
     $providerConfig = App::getEnv('OPR_EXECUTOR_LOGGING_CONFIG', '');
@@ -93,8 +93,8 @@
 });
 
 /**
-* Create a Swoole table to store runtime information
-*/
+ * Create a Swoole table to store runtime information
+ */
 $register->set('activeRuntimes', function () {
     $table = new Table(1024);
 
@@ -111,8 +111,8 @@
 });
 
 /**
-* Create a Swoole table of usage stats (separate for host and containers)
-*/
+ * Create a Swoole table of usage stats (separate for host and containers)
+ */
 $register->set('statsContainers', function () {
     $table = new Table(1024);
 
@@ -141,17 +141,21 @@
 App::setResource('orchestrationConnection', fn (Pool $orchestrationPool) => $orchestrationPool->pop(), ['orchestrationPool']);
 App::setResource('orchestration', fn (Connection $orchestrationConnection) => $orchestrationConnection->getResource(), ['orchestrationConnection']);
 
-function logError(Throwable $error, string $action, Logger $logger = null, Utopia\Route $route = null): void
+App::setResource('log', fn () => new Log());
+
+function logError(Log $log, Throwable $error, string $action, Logger $logger = null, Utopia\Route $route = null): void
 {
     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) {
-        $version = (string) App::getEnv('OPR_EXECUTOR_VERSION', 'UNKNOWN');
+    if ($logger && ($error->getCode() === 500 || $error->getCode() === 0)) {
+        $version = (string) App::getEnv('OPR_EXECUTOR_VERSION', '');
+        if (empty($version)) {
+            $version = 'UNKNOWN';
+        }
 
-        $log = new Log();
         $log->setNamespace("executor");
         $log->setServer(\gethostname() !== false ? \gethostname() : null);
         $log->setVersion($version);
@@ -163,7 +167,7 @@ function logError(Throwable $error, string $action, Logger $logger = null, Utopi
             $log->addTag('url', $route->getPath());
         }
 
-        $log->addTag('code', $error->getCode());
+        $log->addTag('code', \strval($error->getCode()));
         $log->addTag('verboseType', get_class($error));
 
         $log->addExtra('file', $error->getFile());
@@ -281,12 +285,15 @@ function removeAllRuntimes(Table $activeRuntimes, Pool $orchestrationPool): void
     ->inject('orchestration')
     ->inject('activeRuntimes')
     ->inject('response')
-    ->action(function (string $runtimeId, string $image, string $entrypoint, string $source, string $destination, array $variables, array $commands, int $timeout, string $workdir, bool $remove, int $cpus, int $memory, Orchestration $orchestration, Table $activeRuntimes, Response $response) {
+    ->inject('log')
+    ->action(function (string $runtimeId, string $image, string $entrypoint, string $source, string $destination, array $variables, array $commands, int $timeout, string $workdir, bool $remove, int $cpus, int $memory, Orchestration $orchestration, Table $activeRuntimes, Response $response, Log $log) {
         $activeRuntimeId = $runtimeId; // Used with Swoole table (key)
         $runtimeId = System::getHostname() . '-' . $runtimeId; // Used in Docker (name)
 
         $runtimeHostname = \uniqid();
 
+        $log->addTag('runtimeId', $activeRuntimeId);
+
         if ($activeRuntimes->exists($activeRuntimeId)) {
             if ($activeRuntimes->get($activeRuntimeId)['status'] == 'pending') {
                 throw new \Exception('A runtime with the same ID is already being created. Attempt a execution soon.', 500);
@@ -452,7 +459,7 @@ function removeAllRuntimes(Table $activeRuntimes, Pool $orchestrationPool): void
             // Silently try to kill container
             try {
                 $orchestration->remove($containerId, true);
-            } catch(Throwable $th) {
+            } catch (Throwable $th) {
             }
 
             $activeRuntimes->del($activeRuntimeId);
@@ -499,9 +506,12 @@ function removeAllRuntimes(Table $activeRuntimes, Pool $orchestrationPool): void
     ->param('runtimeId', '', new Text(64), 'Runtime unique ID.')
     ->inject('activeRuntimes')
     ->inject('response')
-    ->action(function (string $runtimeId, Table $activeRuntimes, Response $response) {
+    ->inject('log')
+    ->action(function (string $runtimeId, Table $activeRuntimes, Response $response, Log $log) {
         $activeRuntimeId = $runtimeId; // Used with Swoole table (key)
 
+        $log->addTag('runtimeId', $activeRuntimeId);
+
         if (!$activeRuntimes->exists($activeRuntimeId)) {
             throw new Exception('Runtime not found', 404);
         }
@@ -519,10 +529,13 @@ function removeAllRuntimes(Table $activeRuntimes, Pool $orchestrationPool): void
     ->inject('orchestration')
     ->inject('activeRuntimes')
     ->inject('response')
-    ->action(function (string $runtimeId, Orchestration $orchestration, Table $activeRuntimes, Response $response) {
+    ->inject('log')
+    ->action(function (string $runtimeId, Orchestration $orchestration, Table $activeRuntimes, Response $response, Log $log) {
         $activeRuntimeId = $runtimeId; // Used with Swoole table (key)
         $runtimeId = System::getHostname() . '-' . $runtimeId; // Used in Docker (name)
 
+        $log->addTag('runtimeId', $activeRuntimeId);
+
         if (!$activeRuntimes->exists($activeRuntimeId)) {
             throw new Exception('Runtime not found', 404);
         }
@@ -550,11 +563,14 @@ function removeAllRuntimes(Table $activeRuntimes, Pool $orchestrationPool): void
     ->param('memory', 512, new Integer(), 'Comtainer RAM memory.', true)
     ->inject('activeRuntimes')
     ->inject('response')
+    ->inject('log')
     ->action(
-        function (string $runtimeId, string $payload, array $variables, int $timeout, string $image, string $source, string $entrypoint, int $cpus, int $memory, Table $activeRuntimes, Response $response) {
+        function (string $runtimeId, string $payload, array $variables, int $timeout, string $image, string $source, string $entrypoint, int $cpus, int $memory, Table $activeRuntimes, Response $response, Log $log) {
             $activeRuntimeId = $runtimeId; // Used with Swoole table (key)
             $runtimeId = System::getHostname() . '-' . $runtimeId; // Used in Docker (name)
 
+            $log->addTag('runtimeId', $activeRuntimeId);
+
             $variables = \array_merge($variables, [
                 'INERNAL_EXECUTOR_HOSTNAME' => System::getHostname()
             ]);
@@ -617,7 +633,7 @@ function (string $runtimeId, string $payload, array $variables, int $timeout, st
 
                 // Prepare runtime
                 for ($i = 0; $i < 5; $i++) {
-                    [ 'errNo' => $errNo, 'error' => $error, 'statusCode' => $statusCode, 'executorResponse' => $executorResponse ] = \call_user_func($sendCreateRuntimeRequest);
+                    ['errNo' => $errNo, 'error' => $error, 'statusCode' => $statusCode, 'executorResponse' => $executorResponse] = \call_user_func($sendCreateRuntimeRequest);
 
                     if ($errNo === 0 && $statusCode < 500) {
                         $body = \json_decode($executorResponse, true);
@@ -635,6 +651,11 @@ function (string $runtimeId, string $payload, array $variables, int $timeout, st
                 }
             }
 
+            // Update swoole table
+            $runtime = $activeRuntimes->get($activeRuntimeId) ?? [];
+            $runtime['updated'] = \time();
+            $activeRuntimes->set($activeRuntimeId, $runtime);
+
             // Ensure runtime started
             for ($i = 0; $i < 5; $i++) {
                 if ($activeRuntimes->get($activeRuntimeId)['status'] !== 'pending') {
@@ -709,7 +730,7 @@ function (string $runtimeId, string $payload, array $variables, int $timeout, st
 
             // Execute function
             for ($i = 0; $i < 5; $i++) {
-                [ 'errNo' => $errNo, 'error' => $error, 'statusCode' => $statusCode, 'executorResponse' => $executorResponse ] = \call_user_func($sendExecuteRequest);
+                ['errNo' => $errNo, 'error' => $error, 'statusCode' => $statusCode, 'executorResponse' => $executorResponse] = \call_user_func($sendExecuteRequest);
 
                 // No error
                 if ($errNo === 0) {
@@ -804,9 +825,10 @@ function (string $runtimeId, string $payload, array $variables, int $timeout, st
     ->inject('logger')
     ->inject('request')
     ->inject('response')
-    ->action(function (App $utopia, Throwable $error, ?Logger $logger, Request $request, Response $response) {
+    ->inject('log')
+    ->action(function (App $utopia, Throwable $error, ?Logger $logger, Request $request, Response $response, Log $log) {
         $route = $utopia->match($request);
-        logError($error, "httpError", $logger, $route);
+        logError($log, $error, "httpError", $logger, $route);
 
         switch ($error->getCode()) {
             case 400: // Error allowed publicly
@@ -1011,11 +1033,17 @@ function getStats(Table $statsHost, Table $statsContainers, Orchestration $orche
         } catch (\Throwable $th) {
             $code = 500;
 
+
             /**
              * @var Logger $logger
              */
             $logger = $app->getResource('logger');
-            logError($th, "serverError", $logger);
+
+            /**
+             * @var Log $log
+             */
+            $log = $app->getResource('log');
+            logError($log, $th, "serverError", $logger);
             $swooleResponse->setStatusCode($code);
             $output = [
                 'message' => 'Error: ' . $th->getMessage(),