Refactor queue integration

src/Sentry/Laravel/EventHandler.php

@@ -14,7 +14,6 @@
 use Illuminate\Http\Client\Events as HttpClientEvents;
 use Illuminate\Http\Request;
 use Illuminate\Log\Events as LogEvents;
-use Illuminate\Queue\Events as QueueEvents;
 use Illuminate\Routing\Events as RoutingEvents;
 use Laravel\Octane\Events as Octane;
 use Laravel\Sanctum\Events as Sanctum;
@@ -55,18 +54,6 @@ class EventHandler
         Sanctum\TokenAuthenticated::class => 'sanctumTokenAuthenticated', // Since Sanctum 2.13
     ];
 
-    /**
-     * Map queue event handlers to events.
-     *
-     * @var array
-     */
-    protected static $queueEventHandlerMap = [
-        QueueEvents\JobProcessed::class => 'queueJobProcessed',
-        QueueEvents\JobProcessing::class => 'queueJobProcessing',
-        QueueEvents\WorkerStopping::class => 'queueWorkerStopping',
-        QueueEvents\JobExceptionOccurred::class => 'queueJobExceptionOccurred',
-    ];
-
     /**
      * Map Octane event handlers to events.
      *
@@ -114,13 +101,6 @@ class EventHandler
      */
     private $recordLaravelLogs;
 
-    /**
-     * Indicates if we should add queue info to the breadcrumbs.
-     *
-     * @var bool
-     */
-    private $recordQueueInfo;
-
     /**
      * Indicates if we should add command info to the breadcrumbs.
      *
@@ -149,13 +129,6 @@ class EventHandler
      */
     private $recordHttpClientRequests;
 
-    /**
-     * Indicates if we pushed a scope for the queue.
-     *
-     * @var int
-     */
-    private $pushedQueueScopeCount = 0;
-
     /**
      * Indicates if we pushed a scope for Octane.
      *
@@ -176,7 +149,6 @@ public function __construct(Container $container, array $config)
         $this->recordSqlQueries = ($config['breadcrumbs.sql_queries'] ?? $config['breadcrumbs']['sql_queries'] ?? true) === true;
         $this->recordSqlBindings = ($config['breadcrumbs.sql_bindings'] ?? $config['breadcrumbs']['sql_bindings'] ?? false) === true;
         $this->recordLaravelLogs = ($config['breadcrumbs.logs'] ?? $config['breadcrumbs']['logs'] ?? true) === true;
-        $this->recordQueueInfo = ($config['breadcrumbs.queue_info'] ?? $config['breadcrumbs']['queue_info'] ?? true) === true;
         $this->recordCommandInfo = ($config['breadcrumbs.command_info'] ?? $config['breadcrumbs']['command_info'] ?? true) === true;
         $this->recordOctaneTickInfo = ($config['breadcrumbs.octane_tick_info'] ?? $config['breadcrumbs']['octane_tick_info'] ?? true) === true;
         $this->recordOctaneTaskInfo = ($config['breadcrumbs.octane_task_info'] ?? $config['breadcrumbs']['octane_task_info'] ?? true) === true;
@@ -204,7 +176,7 @@ public function subscribeAuthEvents(Dispatcher $dispatcher): void
     }
 
     /**
-     * Attach all queue event handlers.
+     * Attach all Octane event handlers.
      */
     public function subscribeOctaneEvents(Dispatcher $dispatcher): void
     {
@@ -213,16 +185,6 @@ public function subscribeOctaneEvents(Dispatcher $dispatcher): void
         }
     }
 
-    /**
-     * Attach all queue event handlers.
-     */
-    public function subscribeQueueEvents(Dispatcher $dispatcher): void
-    {
-        foreach (static::$queueEventHandlerMap as $eventName => $handler) {
-            $dispatcher->listen($eventName, [$this, $handler]);
-        }
-    }
-
     /**
      * Pass through the event and capture any errors.
      *
@@ -407,57 +369,6 @@ private function configureUserScopeFromModel($authUser): void
         });
     }
 
-    protected function queueJobProcessingHandler(QueueEvents\JobProcessing $event): void
-    {
-        $this->cleanupScopeForTaskWithinLongRunningProcessWhen($this->pushedQueueScopeCount > 0);
-
-        $this->prepareScopeForTaskWithinLongRunningProcess();
-
-        ++$this->pushedQueueScopeCount;
-
-        if (!$this->recordQueueInfo) {
-            return;
-        }
-
-        $job = [
-            'job' => $event->job->getName(),
-            'queue' => $event->job->getQueue(),
-            'attempts' => $event->job->attempts(),
-            'connection' => $event->connectionName,
-        ];
-
-        // Resolve name exists only from Laravel 5.3+
-        if (method_exists($event->job, 'resolveName')) {
-            $job['resolved'] = $event->job->resolveName();
-        }
-
-        Integration::addBreadcrumb(new Breadcrumb(
-            Breadcrumb::LEVEL_INFO,
-            Breadcrumb::TYPE_DEFAULT,
-            'queue.job',
-            'Processing queue job',
-            $job
-        ));
-    }
-
-    protected function queueJobExceptionOccurredHandler(QueueEvents\JobExceptionOccurred $event): void
-    {
-        $this->afterTaskWithinLongRunningProcess();
-    }
-
-    protected function queueJobProcessedHandler(QueueEvents\JobProcessed $event): void
-    {
-        $this->cleanupScopeForTaskWithinLongRunningProcessWhen($this->pushedQueueScopeCount > 0);
-
-        $this->afterTaskWithinLongRunningProcess();
-    }
-
-    protected function queueWorkerStoppingHandler(QueueEvents\WorkerStopping $event): void
-    {
-        // Flush any and all events that were possibly generated by queue jobs
-        Integration::flushEvents();
-    }
-
     protected function commandStartingHandler(ConsoleEvents\CommandStarting $event): void
     {
         if ($event->command) {
@@ -630,7 +541,6 @@ private function logLevelToBreadcrumbLevel(string $level): string
      */
     private function afterTaskWithinLongRunningProcess(): void
     {
-        // Flush any and all events that were possibly generated by queue jobs
         Integration::flushEvents();
     }
 

src/Sentry/Laravel/Features/CacheIntegration.php

@@ -19,7 +19,8 @@ class CacheIntegration extends Feature
 
     public function isApplicable(): bool
     {
-        return $this->isTracingFeatureEnabled('redis_commands') || $this->isBreadcrumbFeatureEnabled('cache');
+        return $this->isTracingFeatureEnabled('redis_commands')
+            || $this->isBreadcrumbFeatureEnabled('cache');
     }
 
     public function setup(Dispatcher $events): void

src/Sentry/Laravel/Features/LivewirePackageIntegration.php

@@ -27,7 +27,8 @@ public function isApplicable(): bool
             return false;
         }
 
-        return $this->isTracingFeatureEnabled(self::FEATURE_KEY) || $this->isBreadcrumbFeatureEnabled(self::FEATURE_KEY);
+        return $this->isTracingFeatureEnabled(self::FEATURE_KEY)
+            || $this->isBreadcrumbFeatureEnabled(self::FEATURE_KEY);
     }
 
     public function setup(LivewireManager $livewireManager): void