feat: improve shopware exception ignoring

src/Integration/FilterExceptionEvent.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Frosh\SentryBundle\Integration;
+
+use Sentry\ExceptionDataBag;
+use Symfony\Contracts\EventDispatcher\Event;
+
+class FilterExceptionEvent extends Event
+{
+
+    /**
+     * @param ExceptionDataBag[] $exceptions
+     */
+    public function __construct(private array $exceptions)
+    {
+    }
+
+    /**
+     * @return ExceptionDataBag[]
+     */
+    public function getExceptions(): array
+    {
+        return $this->exceptions;
+    }
+
+    /**
+     * @param ExceptionDataBag[] $exceptions
+     */
+    public function setExceptions(array $exceptions): void
+    {
+        $this->exceptions = $exceptions;
+    }
+
+
+
+}

src/Integration/UseShopwareExceptionIgnores.php

@@ -5,34 +5,25 @@
 use Sentry\Event;
 use Sentry\Integration\IntegrationInterface;
 use Sentry\State\Scope;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 class UseShopwareExceptionIgnores implements IntegrationInterface
 {
-    /**
-     * @param array<string, array{log_level: string}> $exceptions
-     */
-    public function __construct(private readonly array $exceptions) {}
+    public function __construct(private readonly EventDispatcherInterface $eventDispatcher)
+    {
+    }
 
     public function setupOnce(): void
     {
-        $exceptions = $this->exceptions;
-
-        Scope::addGlobalEventProcessor(function (Event $event) use ($exceptions): ?Event {
-            $eventExceptions = $event->getExceptions()[0] ?? null;
+        $eventDispatcher = $this->eventDispatcher;
 
-            if ($eventExceptions === null) {
+        Scope::addGlobalEventProcessor(static function (Event $event) use ($eventDispatcher): ?Event {
+            $exceptions = $event->getExceptions();
+            if (empty($exceptions)) {
                 return $event;
             }
-
-            $config = $exceptions[$eventExceptions->getType()] ?? [];
-
-            if (!isset($config['log_level'])) {
-                return $event;
-            }
-
-            if ($config['log_level'] === 'notice') {
-                return null;
-            }
+            $exceptions = $eventDispatcher->dispatch(new FilterExceptionEvent($exceptions))->getExceptions();
+            $event->setExceptions($exceptions);
 
             return $event;
         });

src/Resources/config/packages/sentry.yaml

@@ -0,0 +1,8 @@
+sentry:
+  options:
+    ignore_exceptions:
+      - 'Shopware\Storefront\Framework\Routing\Exception\SalesChannelMappingException'
+      - 'Shopware\Core\Framework\Api\Controller\Exception\AuthThrottledException'
+      - 'Shopware\Core\Framework\RateLimiter\Exception\RateLimitExceededException'
+      - 'Symfony\Component\Console\Exception\CommandNotFoundException'
+      - 'League\OAuth2\Server\Exception\OAuthServerException'

src/ShopwareSentryBundle.php

@@ -7,11 +7,18 @@
 use Frosh\SentryBundle\Integration\UseShopwareExceptionIgnores;
 use Frosh\SentryBundle\Listener\FixRequestUrlListener;
 use Frosh\SentryBundle\Listener\SalesChannelContextListener;
+use Frosh\SentryBundle\Subscriber\FilterShopwareExceptionIgnoresSubscriber;
 use Frosh\SentryBundle\Subscriber\FlowLogSubscriber;
 use Frosh\SentryBundle\Subscriber\ScheduledTaskSubscriber;
 use Shopware\Core\System\SalesChannel\Event\SalesChannelContextCreatedEvent;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\DelegatingLoader;
+use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
+use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -21,6 +28,8 @@ class ShopwareSentryBundle extends Bundle
 {
     public function build(ContainerBuilder $container): void
     {
+        $this->loadConfiguration($container);
+
         $container
             ->register(SalesChannelContextListener::class)
             ->addTag('kernel.event_listener', ['event' => SalesChannelContextCreatedEvent::class, 'method' => '__invoke'])
@@ -37,14 +46,19 @@ public function build(ContainerBuilder $container): void
 
         $container
             ->register(UseShopwareExceptionIgnores::class)
-            ->addArgument('%frosh_sentry.exclude_exceptions%');
+            ->addArgument(new Reference('event_dispatcher'));
 
         $container
             ->register(ScheduledTaskSubscriber::class)
             ->addArgument(new Reference('scheduled_task.repository'))
             ->addArgument('%frosh_sentry.report_scheduled_tasks%')
             ->addTag('kernel.event_subscriber');
 
+        $container
+            ->register(FilterShopwareExceptionIgnoresSubscriber::class)
+            ->addArgument('%frosh_sentry.exclude_exceptions%')
+            ->addTag('kernel.event_subscriber');
+
         $container
             ->register(FlowLogSubscriber::class)
             ->addTag('kernel.event_subscriber');
@@ -56,4 +70,19 @@ public function getContainerExtension(): ExtensionInterface
     {
         return new FroshSentryExtension();
     }
+
+    private function loadConfiguration(ContainerBuilder $container): void
+    {
+        $locator = new FileLocator('Resources/config');
+        $resolver = new LoaderResolver([
+            new YamlFileLoader($container, $locator),
+            new GlobFileLoader($container, $locator),
+            new DirectoryLoader($container, $locator),
+        ]);
+
+        $configLoader = new DelegatingLoader($resolver);
+        $confDir = \rtrim($this->getPath(), '/') . '/Resources/config';
+        $configLoader->load($confDir . '/{packages}/*.yaml', 'glob');
+
+    }
 }

src/Subscriber/FilterShopwareExceptionIgnoresSubscriber.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Frosh\SentryBundle\Subscriber;
+
+use Frosh\SentryBundle\Integration\FilterExceptionEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class FilterShopwareExceptionIgnoresSubscriber implements EventSubscriberInterface
+{
+
+    public function __construct(private readonly array $shopwareExceptionConfig)
+    {
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            FilterExceptionEvent::class => 'filterSentryExceptions',
+        ];
+    }
+
+
+    public function filterSentryExceptions(FilterExceptionEvent $event): void
+    {
+        $filteredExceptions = [];
+        foreach ($event->getExceptions() as $exception) {
+
+            $exceptionLogLevel = $this->shopwareExceptionConfig[$exception->getType()]['log_level'] ?? null;
+
+            if ($exceptionLogLevel === 'notice') {
+                continue;
+            }
+
+            $filteredExceptions[] = $exception;
+        }
+
+        $event->setExceptions($filteredExceptions);
+
+
+    }
+}