Laravel: hook Foundation\Application.

Author: ChrisLightfootWild

src/Instrumentation/Laravel/src/Hooks/Illuminate/Foundation/Application.php

@@ -6,32 +6,38 @@
 
 use Illuminate\Contracts\Foundation\Application as ApplicationContract;
 use Illuminate\Foundation\Application as FoundationalApplication;
-use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\LaravelHook;
-use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\LaravelHookTrait;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Logs\LoggerInterface;
+use OpenTelemetry\API\Metrics\MeterInterface;
+use OpenTelemetry\API\Trace\TracerInterface;
+use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Hook;
+use OpenTelemetry\Contrib\Instrumentation\Laravel\LaravelConfiguration;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Watchers\CacheWatcher;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Watchers\ClientRequestWatcher;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Watchers\ExceptionWatcher;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Watchers\LogWatcher;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Watchers\QueryWatcher;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Watchers\Watcher;
-use function OpenTelemetry\Instrumentation\hook;
 use Throwable;
 
-class Application implements LaravelHook
+class Application implements Hook
 {
-    use LaravelHookTrait;
-
-    public function instrument(): void
-    {
-        hook(
+    public function instrument(
+        HookManager $hookManager,
+        LaravelConfiguration $configuration,
+        LoggerInterface $logger,
+        MeterInterface $meter,
+        TracerInterface $tracer,
+    ): void {
+        $hookManager->hook(
             FoundationalApplication::class,
             '__construct',
-            post: function (FoundationalApplication $application, array $params, mixed $returnValue, ?Throwable $exception) {
+            postHook: function (FoundationalApplication $application, array $params, mixed $returnValue, ?Throwable $exception) use ($tracer) {
                 $this->registerWatchers($application, new CacheWatcher());
-                $this->registerWatchers($application, new ClientRequestWatcher($this->instrumentation));
+                $this->registerWatchers($application, new ClientRequestWatcher($tracer));
                 $this->registerWatchers($application, new ExceptionWatcher());
                 $this->registerWatchers($application, new LogWatcher());
-                $this->registerWatchers($application, new QueryWatcher($this->instrumentation));
+                $this->registerWatchers($application, new QueryWatcher($tracer));
             },
         );
     }