Configure the SubRequestListener

Author: Jean85

src/DependencyInjection/Configuration.php

@@ -120,6 +120,7 @@ public function getConfigTreeBuilder()
                 ->addDefaultsIfNotSet()
                 ->children()
                     ->scalarNode('request')->defaultValue(1)->end()
+                    ->scalarNode('sub_request')->defaultValue(1)->end()
                     ->scalarNode('console')->defaultValue(1)->end()
                 ->end()
             ->end();

src/Resources/config/services.xml

@@ -38,5 +38,10 @@
             <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="%sentry.listener_priorities.request%" />
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" priority="%sentry.listener_priorities.request%" />
         </service>
+
+        <service id="Sentry\SentryBundle\EventListener\SubRequestListener" class="Sentry\SentryBundle\EventListener\SubRequestListener" public="false">
+            <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="%sentry.listener_priorities.sub_request%" />
+            <tag name="kernel.event_listener" event="kernel.finish_request" method="onKernelFinishRequest" priority="%sentry.listener_priorities.sub_request%" />
+        </service>
     </services>
 </container>

test/DependencyInjection/ConfigurationTest.php

@@ -45,6 +45,7 @@ public function testConfigurationDefaults(): void
             'dsn' => null,
             'listener_priorities' => [
                 'request' => 1,
+                'sub_request' => 1,
                 'console' => 1,
             ],
             'options' => [

test/SentryBundleTest.php

@@ -6,9 +6,12 @@
 use Sentry\SentryBundle\DependencyInjection\SentryExtension;
 use Sentry\SentryBundle\EventListener\ConsoleListener;
 use Sentry\SentryBundle\EventListener\RequestListener;
+use Sentry\SentryBundle\EventListener\SubRequestListener;
+use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 class SentryBundleTest extends TestCase
 {
@@ -21,7 +24,7 @@ public function testContainerHasConsoleListenerConfiguredCorrectly(): void
         $expectedTag = [
             'kernel.event_listener' => [
                 [
-                    'event' => 'console.command',
+                    'event' => ConsoleEvents::COMMAND,
                     'method' => 'onConsoleCommand',
                     'priority' => '%sentry.listener_priorities.console%',
                 ],
@@ -40,12 +43,12 @@ public function testContainerHasRequestListenerConfiguredCorrectly(): void
         $expectedTag = [
             'kernel.event_listener' => [
                 [
-                    'event' => 'kernel.request',
+                    'event' => KernelEvents::REQUEST,
                     'method' => 'onKernelRequest',
                     'priority' => '%sentry.listener_priorities.request%',
                 ],
                 [
-                    'event' => 'kernel.controller',
+                    'event' => KernelEvents::CONTROLLER,
                     'method' => 'onKernelController',
                     'priority' => '%sentry.listener_priorities.request%',
                 ],
@@ -55,6 +58,30 @@ public function testContainerHasRequestListenerConfiguredCorrectly(): void
         $this->assertSame($expectedTag, $consoleListener->getTags());
     }
 
+    public function testContainerHasSubRequestListenerConfiguredCorrectly(): void
+    {
+        $container = $this->getContainer();
+
+        $consoleListener = $container->getDefinition(SubRequestListener::class);
+
+        $expectedTag = [
+            'kernel.event_listener' => [
+                [
+                    'event' => KernelEvents::REQUEST,
+                    'method' => 'onKernelRequest',
+                    'priority' => '%sentry.listener_priorities.sub_request%',
+                ],
+                [
+                    'event' => KernelEvents::FINISH_REQUEST,
+                    'method' => 'onKernelFinishRequest',
+                    'priority' => '%sentry.listener_priorities.sub_request%',
+                ],
+            ],
+        ];
+
+        $this->assertSame($expectedTag, $consoleListener->getTags());
+    }
+
     private function getContainer(array $configuration = []): ContainerBuilder
     {
         $containerBuilder = new ContainerBuilder();