Laravel Instrumentation

src/Instrumentation/Laravel/composer.json

@@ -15,21 +15,22 @@
     "open-telemetry/sem-conv": "^1"
   },
   "require-dev": {
+    "friendsofphp/php-cs-fixer": "^3",
+    "guzzlehttp/guzzle": "*",
+    "laravel/sail": "*",
     "laravel/sanctum": "*",
+    "laravel/tinker": "*",
+    "mockery/mockery": "2.0.x-dev",
     "nunomaduro/collision": "*",
-    "friendsofphp/php-cs-fixer": "^3",
+    "open-telemetry/sdk": "^1.0",
     "phan/phan": "^5.0",
     "php-http/mock-client": "*",
     "phpstan/phpstan": "^1.1",
     "phpstan/phpstan-phpunit": "^1.0",
-    "psalm/plugin-phpunit": "^0.16",
-    "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^4.0",
+    "psalm/plugin-phpunit": "^0.16",
     "spatie/laravel-ignition": "*",
-    "laravel/sail": "*",
-    "laravel/tinker": "*",
-    "guzzlehttp/guzzle": "*"
+    "vimeo/psalm": "^4.0"
   },
   "autoload": {
     "psr-4": {
@@ -46,6 +47,7 @@
     }
   },
   "config": {
+    "sort-packages": true,
     "allow-plugins": {
       "php-http/discovery": false
     }

src/Instrumentation/Laravel/src/CommandWatcher.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenTelemetry\Contrib\Instrumentation\Laravel;
+
+use Illuminate\Console\Events\CommandFinished;
+use Illuminate\Contracts\Foundation\Application;
+use OpenTelemetry\API\Trace\Span;
+use OpenTelemetry\Context\Context;
+
+class CommandWatcher extends Watcher
+{
+    /** @psalm-suppress UndefinedInterfaceMethod */
+    public function register(Application $app): void
+    {
+        $app['events']->listen(CommandFinished::class, [$this, 'recordCommandFinished']);
+    }
+
+    public function recordCommandFinished(CommandFinished $command): void
+    {
+        $scope = Context::storage()->scope();
+        if (!$scope) {
+            return;
+        }
+        $span = Span::fromContext($scope->context());
+        $span->addEvent('command finished', [
+            'command' => $command->command,
+            'exit-code' => $command->exitCode,
+        ]);
+    }
+}

src/Instrumentation/Laravel/src/LaravelInstrumentation.php

@@ -4,8 +4,8 @@
 
 namespace OpenTelemetry\Contrib\Instrumentation\Laravel;
 
-use Illuminate\Foundation\Application;
-use Illuminate\Foundation\Http\Kernel;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Http\Request;
 use OpenTelemetry\API\Globals;
 use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
@@ -93,19 +93,16 @@ public static function register(): void
             }
         );
         hook(
-            Kernel::class,
+            Application::class,
             '__construct',
-            pre: static function (Kernel $kernel, array $params, string $class, string $function, ?string $filename, ?int $lineno) use ($instrumentation) {
-                $app = $params[0];
-                $app->booted(static function (Application $app) use ($instrumentation) {
-                    self::registerWatchers($app, new ClientRequestWatcher($instrumentation));
-                    self::registerWatchers($app, new ExceptionWatcher());
-                    self::registerWatchers($app, new CacheWatcher());
-                    self::registerWatchers($app, new LogWatcher());
-                    self::registerWatchers($app, new QueryWatcher($instrumentation));
-                });
+            post: static function (Application $application, array $params, mixed $returnValue, ?Throwable $exception) use ($instrumentation) {
+                self::registerWatchers($application, new ClientRequestWatcher($instrumentation));
+                self::registerWatchers($application, new ExceptionWatcher());
+                self::registerWatchers($application, new CacheWatcher());
+                self::registerWatchers($application, new CommandWatcher());
+                self::registerWatchers($application, new LogWatcher());
+                self::registerWatchers($application, new QueryWatcher($instrumentation));
             },
-            post: null
         );
     }
 

src/Instrumentation/Laravel/tests/Integration/LaravelInstrumentationTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace OpenTelemetry\Tests\Instrumentation\Laravel\tests\Integration;
+namespace OpenTelemetry\Tests\Instrumentation\Laravel\Integration;
 
 use ArrayObject;
 use Illuminate\Foundation\Http\Kernel;