Merge branch 'master' into 3.x

Author: cleptric

CHANGELOG.md

@@ -20,6 +20,10 @@
 - Add tracing span for Laravel HTTP client requests (#585)
 - Simplify Sentry meta tag retrieval, by adding `Sentry\Laravel\Integration::sentryMeta()` (#586)
 
+## 2.14.2
+
+- Fix extracting command input resulting in errors when calling Artisan commands programatically with `null` as an argument value (#589)
+
 ## 2.14.1
 
 - Fix not setting the correct SDK ID and version when running the `sentry:test` command (#582)

src/Sentry/Laravel/EventHandler.php

@@ -22,6 +22,8 @@
 use Sentry\Breadcrumb;
 use Sentry\SentrySdk;
 use Sentry\State\Scope;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputInterface;
 
 class EventHandler
 {
@@ -443,9 +445,9 @@ protected function commandStartingHandler(ConsoleEvents\CommandStarting $event):
                 Breadcrumb::TYPE_DEFAULT,
                 'artisan.command',
                 'Starting Artisan command: ' . $event->command,
-                method_exists($event->input, '__toString') ? [
-                    'input' => (string)$event->input,
-                ] : []
+                [
+                    'input' => $this->extractConsoleCommandInput($event->input),
+                ]
             ));
         }
     }
@@ -458,20 +460,35 @@ protected function commandFinishedHandler(ConsoleEvents\CommandFinished $event):
                 Breadcrumb::TYPE_DEFAULT,
                 'artisan.command',
                 'Finished Artisan command: ' . $event->command,
-                array_merge([
+                [
                     'exit' => $event->exitCode,
-                ], method_exists($event->input, '__toString') ? [
-                    'input' => (string)$event->input,
-                ] : [])
+                    'input' => $this->extractConsoleCommandInput($event->input),
+                ]
             ));
         }
 
+        // Flush any and all events that were possibly generated by the command
+        Integration::flushEvents();
+
         Integration::configureScope(static function (Scope $scope): void {
-            $scope->setTag('command', '');
+            $scope->removeTag('command');
         });
+    }
 
-        // Flush any and all events that were possibly generated by the command
-        Integration::flushEvents();
+    /**
+     * Extract the command input arguments if possible.
+     *
+     * @param \Symfony\Component\Console\Input\InputInterface|null $input
+     *
+     * @return string|null
+     */
+    private function extractConsoleCommandInput(?InputInterface $input): ?string
+    {
+        if ($input instanceof ArgvInput) {
+            return (string)$input;
+        }
+
+        return null;
     }
 
     protected function octaneRequestReceivedHandler(Octane\RequestReceived $event): void

src/Sentry/Laravel/Version.php

@@ -5,5 +5,5 @@
 final class Version
 {
     public const SDK_IDENTIFIER = 'sentry.php.laravel';
-    public const SDK_VERSION = '2.14.1';
+    public const SDK_VERSION = '2.14.2';
 }

test/Sentry/CommandInfoInBreadcrumbsTest.php

@@ -3,7 +3,7 @@
 namespace Sentry\Laravel\Tests;
 
 use Illuminate\Console\Events\CommandStarting;
-use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 
 class CommandInfoInBreadcrumbsTest extends SentryLaravelTestCase
@@ -47,7 +47,7 @@ private function dispatchCommandStartEvent()
             CommandStarting::class,
             new CommandStarting(
                 'test:command',
-                new ArrayInput(['--foo' => 'bar']),
+                new ArgvInput(['artisan', '--foo=bar']),
                 new BufferedOutput()
             )
         );