diff --git a/app/Exceptions/Trackers/Bugsnag.php b/app/Exceptions/Trackers/Bugsnag.php index b98bb26ea..818c39ec2 100644 --- a/app/Exceptions/Trackers/Bugsnag.php +++ b/app/Exceptions/Trackers/Bugsnag.php @@ -16,8 +16,14 @@ class Bugsnag 'company_id' => (string) company_id(), 'locale' => (string) app()->getLocale(), 'timezone' => (string) config('app.timezone'), + 'route_name' => (string) static::getRouteName(), ] ]); }); } + + public static function getRouteName(): ?string + { + return request()->route()?->getName(); + } } diff --git a/app/Exceptions/Trackers/Sentry.php b/app/Exceptions/Trackers/Sentry.php index 1353b7d92..8bad77c3b 100644 --- a/app/Exceptions/Trackers/Sentry.php +++ b/app/Exceptions/Trackers/Sentry.php @@ -18,6 +18,7 @@ class Sentry 'locale' => (string) app()->getLocale(), 'timezone' => (string) config('app.timezone'), 'app_type' => (string) static::getAppType(), + 'route_name' => (string) static::getRouteName(), ]); return $event; @@ -67,4 +68,9 @@ class Sentry return $app_type; } + + public static function getRouteName(): ?string + { + return request()->route()?->getName(); + } } diff --git a/composer.json b/composer.json index 29b29928d..708d9e036 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "plank/laravel-mediable": "^5.4", "riverskies/laravel-mobile-detect": "^1.3", "santigarcor/laratrust": "^7.0", - "sentry/sentry-laravel": "^2.14", + "sentry/sentry-laravel": "^3.0", "simple-icons/simple-icons": "^6.0", "simshaun/recurr": "^5.0", "staudenmeir/belongs-to-through": "^2.12", diff --git a/composer.lock b/composer.lock index 5778c9b41..f1363e19a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5eb123ba8c9a1d72f5dd69cd140e47ab", + "content-hash": "8c3e839574009ba27f0d0cdf0b8d8f0c", "packages": [ { "name": "akaunting/laravel-apexcharts", @@ -907,16 +907,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.238.5", + "version": "3.239.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "2f5440652fa7a6f20a1bb15926dd8248c24c733c" + "reference": "33ae76381b77a1a2580817996dcc7b9e931ae5f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2f5440652fa7a6f20a1bb15926dd8248c24c733c", - "reference": "2f5440652fa7a6f20a1bb15926dd8248c24c733c", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/33ae76381b77a1a2580817996dcc7b9e931ae5f4", + "reference": "33ae76381b77a1a2580817996dcc7b9e931ae5f4", "shasum": "" }, "require": { @@ -995,9 +995,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.238.5" + "source": "https://github.com/aws/aws-sdk-php/tree/3.239.0" }, - "time": "2022-10-14T18:15:06+00:00" + "time": "2022-10-18T18:17:00+00:00" }, { "name": "balping/json-raw-encoder", @@ -4858,16 +4858,16 @@ }, { "name": "laravel/framework", - "version": "v9.35.1", + "version": "v9.36.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "79aed20f54b6ab75f926bf7d0dd7a5043ceb774a" + "reference": "0bcd350eec1974c9f912f129368587ef7e43722b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/79aed20f54b6ab75f926bf7d0dd7a5043ceb774a", - "reference": "79aed20f54b6ab75f926bf7d0dd7a5043ceb774a", + "url": "https://api.github.com/repos/laravel/framework/zipball/0bcd350eec1974c9f912f129368587ef7e43722b", + "reference": "0bcd350eec1974c9f912f129368587ef7e43722b", "shasum": "" }, "require": { @@ -5040,7 +5040,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-10-11T17:30:47+00:00" + "time": "2022-10-18T18:46:20+00:00" }, { "name": "laravel/sanctum", @@ -5619,16 +5619,16 @@ }, { "name": "league/flysystem", - "version": "3.7.0", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "0deb0ff21094cbd37b13cbda085c076312708e6c" + "reference": "60f3760352fe08e918bc3b1acae4e91af092ebe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0deb0ff21094cbd37b13cbda085c076312708e6c", - "reference": "0deb0ff21094cbd37b13cbda085c076312708e6c", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/60f3760352fe08e918bc3b1acae4e91af092ebe1", + "reference": "60f3760352fe08e918bc3b1acae4e91af092ebe1", "shasum": "" }, "require": { @@ -5690,7 +5690,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.7.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.9.0" }, "funding": [ { @@ -5706,25 +5706,25 @@ "type": "tidelift" } ], - "time": "2022-10-17T07:23:36+00:00" + "time": "2022-10-18T21:02:43+00:00" }, { "name": "league/flysystem-aws-s3-v3", - "version": "3.7.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "8c884379593dd2081ec07394842665be6fe6fd61" + "reference": "192c0e7f36fe4e5a79cce94f8359076630b641f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/8c884379593dd2081ec07394842665be6fe6fd61", - "reference": "8c884379593dd2081ec07394842665be6fe6fd61", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/192c0e7f36fe4e5a79cce94f8359076630b641f8", + "reference": "192c0e7f36fe4e5a79cce94f8359076630b641f8", "shasum": "" }, "require": { "aws/aws-sdk-php": "^3.132.4", - "league/flysystem": "^3.7.0", + "league/flysystem": "^3.8.0", "league/mime-type-detection": "^1.0.0", "php": "^8.0.2" }, @@ -5760,7 +5760,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.7.0" + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.8.0" }, "funding": [ { @@ -5776,7 +5776,7 @@ "type": "tidelift" } ], - "time": "2022-10-16T21:21:26+00:00" + "time": "2022-10-18T06:40:06+00:00" }, { "name": "league/mime-type-detection", @@ -7225,16 +7225,16 @@ }, { "name": "nunomaduro/termwind", - "version": "v1.14.0", + "version": "v1.14.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/termwind.git", - "reference": "10065367baccf13b6e30f5e9246fa4f63a79eb1d" + "reference": "86fc30eace93b9b6d4c844ba6de76db84184e01b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/10065367baccf13b6e30f5e9246fa4f63a79eb1d", - "reference": "10065367baccf13b6e30f5e9246fa4f63a79eb1d", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/86fc30eace93b9b6d4c844ba6de76db84184e01b", + "reference": "86fc30eace93b9b6d4c844ba6de76db84184e01b", "shasum": "" }, "require": { @@ -7291,7 +7291,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/termwind/issues", - "source": "https://github.com/nunomaduro/termwind/tree/v1.14.0" + "source": "https://github.com/nunomaduro/termwind/tree/v1.14.1" }, "funding": [ { @@ -7307,7 +7307,7 @@ "type": "github" } ], - "time": "2022-08-01T11:03:24+00:00" + "time": "2022-10-17T15:20:29+00:00" }, { "name": "nyholm/psr7", @@ -9628,37 +9628,42 @@ }, { "name": "sentry/sentry-laravel", - "version": "2.14.2", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-laravel.git", - "reference": "4538ed31d77868dd3b6d72ad6e5e68b572beeb9f" + "reference": "1b4458396b6f4cd0e8a63cfb9f8fc38240da1c86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/4538ed31d77868dd3b6d72ad6e5e68b572beeb9f", - "reference": "4538ed31d77868dd3b6d72ad6e5e68b572beeb9f", + "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/1b4458396b6f4cd0e8a63cfb9f8fc38240da1c86", + "reference": "1b4458396b6f4cd0e8a63cfb9f8fc38240da1c86", "shasum": "" }, "require": { - "illuminate/support": "5.0 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0", + "illuminate/support": "^6.0 | ^7.0 | ^8.0 | ^9.0", "nyholm/psr7": "^1.0", "php": "^7.2 | ^8.0", "sentry/sdk": "^3.1", - "sentry/sentry": "^3.3", + "sentry/sentry": "^3.9", "symfony/psr-http-message-bridge": "^1.0 | ^2.0" }, + "conflict": { + "laravel/lumen-framework": "*" + }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.11", - "laravel/framework": "5.0 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0", + "laravel/framework": "^6.0 | ^7.0 | ^8.0 | ^9.0", "mockery/mockery": "^1.3", - "orchestra/testbench": "3.1 - 3.8 | ^4.7 | ^5.1 | ^6.0 | ^7.0", - "phpunit/phpunit": "^5.7 | ^6.5 | ^7.5 | ^8.4 | ^9.3" + "orchestra/testbench": "^4.7 | ^5.1 | ^6.0 | ^7.0", + "phpunit/phpunit": "^8.4 | ^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev", + "dev-master": "3.x-dev", + "dev-2.x": "2.x-dev", + "dev-1.x": "1.x-dev", "dev-0.x": "0.x-dev" }, "laravel": { @@ -9700,7 +9705,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-laravel/issues", - "source": "https://github.com/getsentry/sentry-laravel/tree/2.14.2" + "source": "https://github.com/getsentry/sentry-laravel/tree/3.0.0" }, "funding": [ { @@ -9712,7 +9717,7 @@ "type": "custom" } ], - "time": "2022-10-13T09:21:29+00:00" + "time": "2022-10-19T08:46:34+00:00" }, { "name": "simple-icons/simple-icons", diff --git a/config/sentry.php b/config/sentry.php index 5c9efd700..cb0702773 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -52,8 +52,6 @@ return [ 'traces_sample_rate' => (float)(env('SENTRY_TRACES_SAMPLE_RATE', 0.0)), - 'controllers_base_namespace' => env('SENTRY_CONTROLLERS_BASE_NAMESPACE', 'App\\Http\\Controllers'), - 'before_send' => [env('SENTRY_BEFORE_SEND_CLASS', 'App\\Exceptions\\Trackers\\Sentry'), 'beforeSend'], 'traces_sampler' => [env('SENTRY_TRACES_SAMPLER_CLASS', 'App\\Exceptions\\Trackers\\Sentry'), 'tracesSampler'],