wip: cli

Author: overtrue

config/otle.php

@@ -20,6 +20,11 @@
      */
     'automatically_trace_requests' => env('OTLE_AUTO_TRACE_REQUESTS', true),
 
+    /**
+     * Auto start console tracer
+     */
+    'automatically_trace_cli' => env('OTLE_AUTO_TRACE_CLI', true),
+
     /**
      * Allow to trace requests with specific headers. You can use `*` as wildcard.
      */

src/Middlewares/MeasureRequest.php

@@ -42,7 +42,7 @@ public function handle(Request $request, Closure $next, ?string $name = null)
 
         $span = Measure::span(sprintf('%s:%s', $request?->method() ?? 'unknown', $request->url()))
             ->setAttributes($this->getRequestSpanAttributes($request))
-            ->start(false);
+            ->start();
         $context = $span->storeInContext(Context::getCurrent());
         $scope = $context->activate();
 

src/OpenTelemetryServiceProvider.php

@@ -7,11 +7,14 @@
 use Illuminate\Config\Repository;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\ServiceProvider;
+use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\SDK\Common\Time\ClockFactory;
 use Overtrue\LaravelOpenTelemetry\Middlewares\MeasureRequest;
 use Overtrue\LaravelOpenTelemetry\Support\CarbonClock;
 use Overtrue\LaravelOpenTelemetry\Support\Measure;
 use Overtrue\LaravelOpenTelemetry\Support\OpenTelemetryMonologHandler;
+use Overtrue\LaravelOpenTelemetry\Watchers\CommandWatcher;
+use Overtrue\LaravelOpenTelemetry\Watchers\ScheduledTaskWatcher;
 
 class OpenTelemetryServiceProvider extends ServiceProvider
 {
@@ -30,6 +33,28 @@ public function boot(): void
         if (config('otle.automatically_trace_requests')) {
             $this->injectHttpMiddleware(app(Kernel::class));
         }
+
+        if ($this->app->runningInConsole() && config('otle.automatically_trace_cli')) {
+            $tracer = $this->app->make(TracerManager::class)->driver(config('otle.default'));
+            $tracer->register($this->app);
+
+            foreach ([
+                CommandWatcher::class,
+                ScheduledTaskWatcher::class,
+            ] as $watcher) {
+                $this->app->make($watcher)->register($this->app);
+            }
+
+            $span = Facades\Measure::span('artisan')
+                ->setSpanKind(SpanKind::KIND_SERVER)
+                ->start();
+            $scope = $span->activate();
+
+            $this->app->terminating(function () use ($span, $scope) {
+                $span->end();
+                $scope->detach();
+            });
+        }
     }
 
     public function register(): void

src/Watchers/EventWatcher.php

@@ -21,7 +21,7 @@ public function recordEvent($event): void
             return;
         }
 
-        Measure::activeSpan()->addEvent(sprintf('[EVENT] %s fired', $event), [
+        Measure::activeSpan()->addEvent(sprintf('[Event] %s fired', $event), [
             'event.name' => $event,
         ]);
     }