Handle errors when checking for handled exceptions

config/flare.php

@@ -6,7 +6,7 @@
 use Spatie\FlareClient\FlareMiddleware\CensorRequestHeaders;
 use Spatie\LaravelIgnition\FlareMiddleware\AddDumps;
 use Spatie\LaravelIgnition\FlareMiddleware\AddEnvironmentInformation;
-use Spatie\LaravelIgnition\FlareMiddleware\AddExceptionHandled;
+use Spatie\LaravelIgnition\FlareMiddleware\AddExceptionHandledStatus;
 use Spatie\LaravelIgnition\FlareMiddleware\AddExceptionInformation;
 use Spatie\LaravelIgnition\FlareMiddleware\AddJobs;
 use Spatie\LaravelIgnition\FlareMiddleware\AddLogs;
@@ -56,7 +56,7 @@
             'max_chained_job_reporting_depth' => 5,
         ],
         AddContext::class,
-        AddExceptionHandled::class,
+        AddExceptionHandledStatus::class,
         CensorRequestBodyFields::class => [
             'censor_fields' => [
                 'password',

src/FlareMiddleware/AddExceptionHandledStatus.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Spatie\LaravelIgnition\FlareMiddleware;
+
+use Closure;
+use Spatie\Backtrace\Backtrace;
+use Spatie\FlareClient\FlareMiddleware\FlareMiddleware;
+use Spatie\FlareClient\Report;
+use Throwable;
+
+class AddExceptionHandledStatus implements FlareMiddleware
+{
+    public function handle(Report $report, Closure $next): Closure
+    {
+        $frames = Backtrace::create()->limit(40)->frames();
+        $frameCount = count($frames);
+
+        try {
+            foreach ($frames as $i => $frame) {
+                // Check first frame, probably Illuminate\Foundation\Exceptions\Handler::report()
+                // Next frame should be: Illuminate/Foundation/helpers.php::report()
+
+                if ($frame->method !== 'report') {
+                    continue;
+                }
+
+                if ($frame->class === null) {
+                    continue;
+                }
+
+                if ($i === $frameCount - 1) {
+                    continue;
+                }
+
+                if ($frames[$i + 1]->class !== null) {
+                    continue;
+                }
+
+                if ($frames[$i + 1]->method !== 'report') {
+                    continue;
+                }
+
+                $report->handled();
+
+                break;
+            }
+        } catch (Throwable) {
+            // Do nothing
+        }
+
+        return $next($report);
+    }
+}