Release v2.25.1

CHANGELOG.md

@@ -1,6 +1,21 @@
 Changelog
 =========
 
+## v2.25.1 (2023-01-17)
+
+### Enhancements
+
+* Ensure events are sent from queues when using Laravel Vapor
+  [#511](https://github.com/bugsnag/bugsnag-laravel/pull/511)
+
+### Bug fixes
+
+* Fix events from CLI commands always being handled when using the `NunoMaduro\Collision` package
+  [#503](https://github.com/bugsnag/bugsnag-laravel/pull/503)
+
+* Fix breadcrumbs leaking between queued jobs when using Laravel Vapor
+  [#511](https://github.com/bugsnag/bugsnag-laravel/pull/511)
+
 ## 2.25.0 (2022-10-25)
 
 ### Enhancements

Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.6.0'
+gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.9.0'

features/fixtures/docker-compose.yml

@@ -15,6 +15,7 @@ services:
       - BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
       - BUGSNAG_DISCARD_CLASSES
       - BUGSNAG_REDACTED_KEYS
+      - BUGSNAG_QUERY
     restart: "no"
     ports:
       - target: 8000
@@ -34,6 +35,7 @@ services:
       - BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
       - BUGSNAG_DISCARD_CLASSES
       - BUGSNAG_REDACTED_KEYS
+      - BUGSNAG_QUERY
     restart: "no"
     ports:
       - target: 8000
@@ -53,6 +55,7 @@ services:
       - BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
       - BUGSNAG_DISCARD_CLASSES
       - BUGSNAG_REDACTED_KEYS
+      - BUGSNAG_QUERY
     restart: "no"
     ports:
       - target: 8000
@@ -72,13 +75,13 @@ services:
       - BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
       - BUGSNAG_DISCARD_CLASSES
       - BUGSNAG_REDACTED_KEYS
+      - BUGSNAG_QUERY
     restart: "no"
     ports:
       - target: 8000
         published: 61266
 
   laravel8:
-    init: true
     build:
       context: laravel8
       args:
@@ -92,13 +95,13 @@ services:
       - BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
       - BUGSNAG_DISCARD_CLASSES
       - BUGSNAG_REDACTED_KEYS
+      - BUGSNAG_QUERY
     restart: "no"
     ports:
       - target: 8000
         published: 61280
 
   laravel9:
-    init: true
     build:
       context: laravel9
       args:
@@ -112,6 +115,7 @@ services:
       - BUGSNAG_REGISTER_OOM_BOOTSTRAPPER
       - BUGSNAG_DISCARD_CLASSES
       - BUGSNAG_REDACTED_KEYS
+      - BUGSNAG_QUERY
     restart: "no"
     ports:
       - target: 8000

features/fixtures/laravel51/.env

@@ -2,15 +2,11 @@ APP_ENV=local
 APP_DEBUG=true
 APP_KEY=SomeRandomString
 
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_CONNECTION=sqlite
 
 CACHE_DRIVER=file
 SESSION_DRIVER=file
-QUEUE_DRIVER=sync
+QUEUE_DRIVER=database
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null

features/fixtures/laravel51/Dockerfile

@@ -16,4 +16,7 @@ COPY --from=composer:2.2 /usr/bin/composer /usr/local/bin/composer
 RUN composer install --no-dev
 RUN php artisan key:generate
 
+# create database & apply migrations
+RUN touch database/database.sqlite && php artisan migrate --no-interaction
+
 CMD php artisan serve --port=8000 --host=0.0.0.0

features/fixtures/laravel51/app/Http/routes.php

@@ -61,6 +61,14 @@
     return view('handlederror');
 });
 
+Route::get('/queue/unhandled', function () {
+    Queue::push(new \App\Jobs\UnhandledJob());
+});
+
+Route::get('/queue/handled', function () {
+    Queue::push(new \App\Jobs\HandledJob());
+});
+
 /**
  * Return some diagnostics if an OOM did not happen when it should have.
  *

features/fixtures/laravel51/app/Jobs/HandledJob.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Jobs;
+
+use Exception;
+use App\Jobs\Job;
+use Illuminate\Contracts\Bus\SelfHandling;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Bugsnag\BugsnagLaravel\Facades\Bugsnag;
+
+class HandledJob extends Job implements SelfHandling, ShouldQueue
+{
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        Bugsnag::leaveBreadcrumb(__METHOD__);
+
+        Bugsnag::notifyException(new Exception('Handled :)'));
+    }
+}

features/fixtures/laravel51/app/Jobs/UnhandledJob.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Jobs\Job;
+use RuntimeException;
+use Illuminate\Contracts\Bus\SelfHandling;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Bugsnag\BugsnagLaravel\Facades\Bugsnag;
+
+class UnhandledJob extends Job implements SelfHandling, ShouldQueue
+{
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        Bugsnag::leaveBreadcrumb(__METHOD__);
+
+        throw new RuntimeException('uh oh :o');
+    }
+}

features/fixtures/laravel51/app/Providers/AppServiceProvider.php

@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Bugsnag\BugsnagLaravel\Facades\Bugsnag;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -13,7 +14,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        Bugsnag::leaveBreadcrumb(__METHOD__);
     }
 
     /**

features/fixtures/laravel51/app/Providers/EventServiceProvider.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Queue;
+use Bugsnag\BugsnagLaravel\Facades\Bugsnag;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -28,6 +30,8 @@ public function boot(DispatcherContract $events)
     {
         parent::boot($events);
 
-        //
+        Queue::after(function () {
+            Bugsnag::leaveBreadcrumb('after');
+        });
     }
 }

features/fixtures/laravel51/database/migrations/2022_12_06_094153_create_jobs_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('jobs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('queue');
+            $table->longText('payload');
+            $table->tinyInteger('attempts')->unsigned();
+            $table->tinyInteger('reserved')->unsigned();
+            $table->unsignedInteger('reserved_at')->nullable();
+            $table->unsignedInteger('available_at');
+            $table->unsignedInteger('created_at');
+            $table->index(['queue', 'reserved', 'reserved_at']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('jobs');
+    }
+}

features/fixtures/laravel51/database/migrations/2022_12_06_094156_create_failed_jobs_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateFailedJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('failed_jobs', function (Blueprint $table) {
+            $table->increments('id');
+            $table->text('connection');
+            $table->text('queue');
+            $table->longText('payload');
+            $table->timestamp('failed_at')->useCurrent();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('failed_jobs');
+    }
+}

features/fixtures/laravel56/.env

@@ -6,18 +6,13 @@ APP_URL=http://localhost
 
 LOG_CHANNEL=stack
 
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_CONNECTION=sqlite
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
+QUEUE_DRIVER=database
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null

features/fixtures/laravel56/Dockerfile

@@ -16,4 +16,7 @@ COPY --from=composer:2.2 /usr/bin/composer /usr/local/bin/composer
 RUN composer install
 RUN php artisan key:generate
 
+# create database & apply migrations
+RUN touch database/database.sqlite && php artisan migrate --no-interaction
+
 CMD php artisan serve --port=8000 --host=0.0.0.0

features/fixtures/laravel56/app/Jobs/HandledJob.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Jobs;
+
+use Exception;
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Bugsnag\BugsnagLaravel\Facades\Bugsnag;
+
+class HandledJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        Bugsnag::leaveBreadcrumb(__METHOD__);
+
+        Bugsnag::notifyException(new Exception('Handled :)'));
+    }
+}

features/fixtures/laravel56/app/Jobs/UnhandledJob.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Jobs;
+
+use RuntimeException;
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Bugsnag\BugsnagLaravel\Facades\Bugsnag;
+
+class UnhandledJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        Bugsnag::leaveBreadcrumb(__METHOD__);
+
+        throw new RuntimeException('uh oh :o');
+    }
+}

features/fixtures/laravel56/app/Providers/AppServiceProvider.php

@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Bugsnag\BugsnagLaravel\Facades\Bugsnag;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -13,7 +14,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        Bugsnag::leaveBreadcrumb(__METHOD__);
     }
 
     /**