From d0cc9c8a1387089d91e99e2c996da33c66953f8a Mon Sep 17 00:00:00 2001
From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:43:18 -0400
Subject: [PATCH] fix: expanding exception classes & conditioning experiment
 logger

---
 app/controllers/general.php | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/controllers/general.php b/app/controllers/general.php
index 264072ffc3..5df113fe68 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -736,6 +736,7 @@ Http::error()
             Console::error('[Error] Line: ' . $line);
         }
         switch ($class) {
+            case 'Utopia\Servers\Exception':
             case 'Utopia\Http\Exception':
                 $error = new AppwriteException(AppwriteException::GENERAL_UNKNOWN, $message, $code, $error);
                 switch ($code) {
@@ -786,24 +787,26 @@ Http::error()
             $providerName = System::getEnv('_APP_EXPERIMENT_LOGGING_PROVIDER', '');
             $providerConfig = System::getEnv('_APP_EXPERIMENT_LOGGING_CONFIG', '');
 
-            try {
-                $loggingProvider = new DSN($providerConfig ?? '');
-                $providerName = $loggingProvider->getScheme();
+            if (!(empty($providerName) || empty($providerConfig))) {
+                try {
+                    $loggingProvider = new DSN($providerConfig);
+                    $providerName = $loggingProvider->getScheme();
 
-                if (!empty($providerName) && $providerName === 'sentry') {
-                    $key = $loggingProvider->getPassword();
-                    $projectId = $loggingProvider->getUser() ?? '';
-                    $host = 'https://' . $loggingProvider->getHost();
+                    if (!empty($providerName) && $providerName === 'sentry') {
+                        $key = $loggingProvider->getPassword();
+                        $projectId = $loggingProvider->getUser() ?? '';
+                        $host = 'https://' . $loggingProvider->getHost();
 
-                    $adapter = new Sentry($projectId, $key, $host);
-                    $logger = new Logger($adapter);
-                    $logger->setSample(0.04);
-                    $publish = true;
-                } else {
-                    throw new \Exception('Invalid experimental logging provider');
+                        $adapter = new Sentry($projectId, $key, $host);
+                        $logger = new Logger($adapter);
+                        $logger->setSample(0.04);
+                        $publish = true;
+                    } else {
+                        throw new \Exception('Invalid experimental logging provider');
+                    }
+                } catch (\Throwable $th) {
+                    Console::warning('Failed to initialize logging provider: ' . $th->getMessage());
                 }
-            } catch (\Throwable $th) {
-                Console::warning('Failed to initialize logging provider: ' . $th->getMessage());
             }
         }