WIP

Author: Kanti

Classes/Handler/ContentObjectProductionExceptionHandler.php

@@ -6,7 +6,6 @@
 
 use Exception;
 use Pluswerk\Sentry\Service\ConfigService;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Throwable;
 use TYPO3\CMS\Frontend\ContentObject\Exception\ExceptionHandlerInterface;
 use TYPO3\CMS\Frontend\ContentObject\Exception\ProductionExceptionHandler;

Classes/Handler/DebugExceptionHandler.php

@@ -4,9 +4,17 @@
 
 namespace Pluswerk\Sentry\Handler;
 
+use Pluswerk\Sentry\Service\Sentry;
 use Pluswerk\Sentry\Traits\ExceptionHandlerTrait;
 
 class DebugExceptionHandler extends \TYPO3\CMS\Core\Error\DebugExceptionHandler
 {
+    public function __construct()
+    {
+        parent::__construct();
+//        dump(__CLASS__);
+//        Sentry::getInstance(); // TODO only use \Sentry\init(...);
+    }
+
     use ExceptionHandlerTrait;
 }

Classes/Handler/ProductionExceptionHandler.php

@@ -4,9 +4,18 @@
 
 namespace Pluswerk\Sentry\Handler;
 
+use Pluswerk\Sentry\Service\Sentry;
 use Pluswerk\Sentry\Traits\ExceptionHandlerTrait;
+use function dump;
 
 class ProductionExceptionHandler extends \TYPO3\CMS\Core\Error\ProductionExceptionHandler
 {
+    public function __construct()
+    {
+        parent::__construct();
+//        dump(__CLASS__);
+//        Sentry::getInstance(); // TODO only use \Sentry\init(...);
+    }
+
     use ExceptionHandlerTrait;
 }

Classes/Integration/ExtSentryIntegration.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pluswerk\Sentry\Integration;
+
+use Sentry\Event;
+use Sentry\Integration\IntegrationInterface;
+use Sentry\State\Scope;
+
+final readonly class ExtSentryIntegration implements IntegrationInterface{
+
+    public function setupOnce(): void
+    {
+        dd('ExtSentryIntegration::setupOnce() called');
+        Scope::addGlobalEventProcessor(static function (Event $event): Event {
+            $extra = $event->getExtra();
+            $extra['php_version'] ??= PHP_VERSION;
+            $event->setExtra($extra);
+            return $event;
+        });
+    }
+}

Classes/Logger/BreadcrumbLogger.php

@@ -14,22 +14,26 @@
 use TYPO3\CMS\Core\Log\Writer\WriterInterface;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use function sprintf;
 
 class BreadcrumbLogger extends AbstractWriter implements SingletonInterface
 {
     public function writeLog(LogRecord $record): WriterInterface
     {
-        $hub = Sentry::getInstance()->getHub();
+        if (!ExtensionManagementUtility::isLoaded('sentry')) {
+            return $this;
+        }
+
+        $hub = Sentry::getInstance()->getHub(); // TODO remove this if we always call \Sentry\init();
         if (!$hub instanceof HubInterface) {
             return $this;
         }
 
-        if (!ExtensionManagementUtility::isLoaded('sentry')) {
+        if ($record->getComponent() === 'TYPO3.CMS.Frontend.ContentObject.Exception.ProductionExceptionHandler') {
             return $this;
         }
 
-        //send breadcrumb to sentry
-        $hub->addBreadcrumb(
+        \Sentry\addBreadcrumb(
             new Breadcrumb(
                 match ($record->getLevel()) {
                     LogLevel::EMERGENCY => Breadcrumb::LEVEL_FATAL,

Classes/Logger/SentryLogger.php

@@ -21,16 +21,16 @@ class SentryLogger extends AbstractWriter implements SingletonInterface
 {
     public function writeLog(LogRecord $record): WriterInterface
     {
-        $client = Sentry::getInstance()->getClient();
-        if (!$client instanceof ClientInterface) {
+        if (!ExtensionManagementUtility::isLoaded('sentry')) {
             return $this;
         }
 
         if ($record->getComponent() === 'TYPO3.CMS.Frontend.ContentObject.Exception.ProductionExceptionHandler') {
             return $this;
         }
 
-        if (!ExtensionManagementUtility::isLoaded('sentry')) {
+        $client = Sentry::getInstance()->getClient();
+        if (!$client instanceof ClientInterface) {
             return $this;
         }
 

Classes/Service/Sentry.php

@@ -5,7 +5,8 @@
 namespace Pluswerk\Sentry\Service;
 
 use InvalidArgumentException;
-use Pluswerk\Sentry\Transport\MockTransportFactory;
+use Pluswerk\Sentry\Integration\ExtSentryIntegration;
+use Pluswerk\Sentry\Tests\Helper\MockTransportFactory;
 use Pluswerk\Sentry\Transport\QueueTransportFactory;
 use Sentry\ClientBuilder;
 use Sentry\ClientInterface;
@@ -18,8 +19,6 @@
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-use function dd;
 use function getenv;
 use function Sentry\captureException;
 use function Sentry\configureScope;
@@ -31,8 +30,27 @@ public function __construct(
         protected ScopeConfig $scopeConfig,
         protected ConfigService $config,
     ) {
-        dd();
-        $this->setup();
+//        $this->setup();
+    }
+
+    public function staticSetup()
+    {
+//        $config = GeneralUtility::makeInstance(
+//            ConfigService::class,
+//            GeneralUtility::makeInstance(ExtensionConfiguration::class),
+//        );
+
+        \Sentry\init([
+//            'environment' => preg_replace('#[\/\s]#', '', (string)Environment::getContext()),
+            'dsn' => 'https://sentry.example.com/123456', // $config->getDsn(),
+//            'attach_stacktrace' => true,
+//            'error_types' => $config->getErrorsToReport(),
+//            'prefixes' => [Environment::getProjectPath()],
+//            'release' => $config->isWithGitReleases() ? shell_exec('git rev-parse HEAD') : null,
+            'integrations' => [
+                new ExtSentryIntegration(),
+            ]
+        ]);
     }
 
     public function isDisabled(): bool
@@ -60,7 +78,8 @@ protected function setup(): void
 
         $builder = ClientBuilder::create(array_filter($options));
         if ($this->config->isQueueEnabled()) {
-            $builder->setTransportFactory(new QueueTransportFactory());
+            $transport = (new QueueTransportFactory())->create($builder->getOptions());
+            $builder->setTransport($transport);
         }
 
         $this->addMockIfNeeded($builder);
@@ -121,6 +140,7 @@ private function addMockIfNeeded(ClientBuilder $builder): void
         if (!$mockSeed) {
             return;
         }
-        $builder->setTransportFactory(new MockTransportFactory($mockSeed));
+        $transport = (new MockTransportFactory($mockSeed))->register($builder->getOptions());
+        $builder->setTransport($transport);
     }
 }

Classes/Transport/MockTransportFactory.php

@@ -16,6 +16,7 @@
 use Sentry\Response;
 use Sentry\ResponseStatus;
 use Sentry\Serializer\PayloadSerializerInterface;
+use Sentry\Transport\Result;
 use Sentry\Transport\TransportInterface;
 
 class QueueTransport implements TransportInterface
@@ -24,7 +25,7 @@ public function __construct(private Options $options, private PayloadSerializerI
     {
     }
 
-    public function send(Event $event): PromiseInterface
+    public function send(Event $event): Result
     {
         $dsn = $this->options->getDsn();
 
@@ -46,7 +47,7 @@ public function send(Event $event): PromiseInterface
         return new FulfilledPromise($sendResponse);
     }
 
-    public function close(?int $timeout = null): PromiseInterface
+    public function close(?int $timeout = null): Result
     {
         return new FulfilledPromise(true);
     }

Classes/Transport/QueueTransport.php

@@ -12,7 +12,7 @@
 use Sentry\Transport\TransportInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class QueueTransportFactory implements TransportFactoryInterface
+class QueueTransportFactory
 {
     public function create(Options $options): TransportInterface
     {