Laravel: updates after AutoInstrumentation in API was merged to main.

ChrisLightfootWild · ChrisLightfootWild · commit d5cdeca3eb84 · 2024-08-25T21:02:48.000+01:00
diff --git a/src/Instrumentation/Laravel/composer.json b/src/Instrumentation/Laravel/composer.json
@@ -13,7 +13,7 @@
     "ext-json": "*",
     "ext-opentelemetry": "*",
     "laravel/framework": "^10.0 || ^11.0",
-    "open-telemetry/opentelemetry": "dev-auto-instrumentation-registration"
+    "open-telemetry/opentelemetry": "dev-main as 1.x-dev"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.50",
@@ -55,7 +55,7 @@
   "repositories": [
     {
       "type": "vcs",
-      "url": "https://github.com/brettmc/opentelemetry-php"
+      "url": "https://github.com/open-telemetry/opentelemetry-php"
     }
   ],
   "config": {
diff --git a/src/Instrumentation/Laravel/src/Hooks/Hook.php b/src/Instrumentation/Laravel/src/Hooks/Hook.php
@@ -4,7 +4,7 @@
 
 namespace OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks;
 
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\TracerInterface;
@@ -13,7 +13,7 @@
 interface Hook
 {
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Console/Command.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Console/Command.php
@@ -5,7 +5,7 @@
 namespace OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Illuminate\Console;
 
 use Illuminate\Console\Command as IlluminateCommand;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\Span;
@@ -22,7 +22,7 @@ class Command implements Hook
     use PostHookTrait;
 
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
@@ -31,7 +31,7 @@ public function instrument(
         $this->hookExecute($hookManager, $tracer);
     }
 
-    protected function hookExecute(HookManager $hookManager, TracerInterface $tracer): void
+    protected function hookExecute(HookManagerInterface $hookManager, TracerInterface $tracer): void
     {
         $hookManager->hook(
             IlluminateCommand::class,
diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Contracts/Console/Kernel.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Contracts/Console/Kernel.php
@@ -6,7 +6,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel as KernelContract;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\Span;
@@ -28,7 +28,7 @@ class Kernel implements Hook
     use PostHookTrait;
 
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
@@ -39,7 +39,7 @@ public function instrument(
         }
     }
 
-    private function hookHandle(HookManager $hookManager, TracerInterface $tracer): void
+    private function hookHandle(HookManagerInterface $hookManager, TracerInterface $tracer): void
     {
         $hookManager->hook(
             KernelContract::class,
diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Contracts/Http/Kernel.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Contracts/Http/Kernel.php
@@ -8,7 +8,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
 use OpenTelemetry\API\Globals;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\Span;
@@ -31,7 +31,7 @@ class Kernel implements Hook
     use PostHookTrait;
 
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
@@ -40,7 +40,7 @@ public function instrument(
         $this->hookHandle($hookManager, $tracer);
     }
 
-    protected function hookHandle(HookManager $hookManager, TracerInterface $tracer): void
+    protected function hookHandle(HookManagerInterface $hookManager, TracerInterface $tracer): void
     {
         $hookManager->hook(
             KernelContract::class,
diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Contracts/Queue/Queue.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Contracts/Queue/Queue.php
@@ -7,14 +7,14 @@
 use DateInterval;
 use DateTimeInterface;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\TracerInterface;
 use OpenTelemetry\Context\Context;
-use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Illuminate\Queue\AttributesBuilder;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Hook;
+use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Illuminate\Queue\AttributesBuilder;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\PostHookTrait;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\LaravelConfiguration;
 use OpenTelemetry\SemConv\TraceAttributes;
@@ -27,7 +27,7 @@ class Queue implements Hook
     use PostHookTrait;
 
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
@@ -38,7 +38,7 @@ public function instrument(
         $this->hookPushRaw($hookManager, $tracer);
     }
 
-    protected function hookBulk(HookManager $hookManager, TracerInterface $tracer): void
+    protected function hookBulk(HookManagerInterface $hookManager, TracerInterface $tracer): void
     {
         $hookManager->hook(
             QueueContract::class,
@@ -73,7 +73,7 @@ protected function hookBulk(HookManager $hookManager, TracerInterface $tracer):
         );
     }
 
-    protected function hookLater(HookManager $hookManager, TracerInterface $tracer): void
+    protected function hookLater(HookManagerInterface $hookManager, TracerInterface $tracer): void
     {
         $hookManager->hook(
             QueueContract::class,
@@ -115,7 +115,7 @@ protected function hookLater(HookManager $hookManager, TracerInterface $tracer):
         );
     }
 
-    protected function hookPushRaw(HookManager $hookManager, TracerInterface $tracer): void
+    protected function hookPushRaw(HookManagerInterface $hookManager, TracerInterface $tracer): void
     {
         $hookManager->hook(
             QueueContract::class,
diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Foundation/Application.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Foundation/Application.php
@@ -6,7 +6,7 @@
 
 use Illuminate\Contracts\Foundation\Application as ApplicationContract;
 use Illuminate\Foundation\Application as FoundationalApplication;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\TracerInterface;
@@ -23,7 +23,7 @@
 class Application implements Hook
 {
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Foundation/Console/ServeCommand.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Foundation/Console/ServeCommand.php
@@ -5,7 +5,7 @@
 namespace OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Illuminate\Foundation\Console;
 
 use Illuminate\Foundation\Console\ServeCommand as FoundationServeCommand;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\TracerInterface;
@@ -18,7 +18,7 @@
 class ServeCommand implements Hook
 {
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Queue/Queue.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Queue/Queue.php
@@ -5,7 +5,7 @@
 namespace OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Illuminate\Queue;
 
 use Illuminate\Queue\Queue as AbstractQueue;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
@@ -19,7 +19,7 @@ class Queue implements Hook
     use AttributesBuilder;
 
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Queue/SyncQueue.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Queue/SyncQueue.php
@@ -5,7 +5,7 @@
 namespace OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Illuminate\Queue;
 
 use Illuminate\Queue\SyncQueue as LaravelSyncQueue;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\SpanKind;
@@ -23,7 +23,7 @@ class SyncQueue implements Hook
     use PostHookTrait;
 
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
@@ -32,7 +32,7 @@ public function instrument(
         $this->hookPush($hookManager, $tracer);
     }
 
-    protected function hookPush(HookManager $hookManager, TracerInterface $tracer): void
+    protected function hookPush(HookManagerInterface $hookManager, TracerInterface $tracer): void
     {
         $hookManager->hook(
             LaravelSyncQueue::class,
diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Queue/Worker.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Queue/Worker.php
@@ -6,7 +6,7 @@
 
 use Illuminate\Contracts\Queue\Job;
 use Illuminate\Queue\Worker as QueueWorker;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Logs\LoggerInterface;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
@@ -27,7 +27,7 @@ class Worker implements Hook
     use PostHookTrait;
 
     public function instrument(
-        HookManager $hookManager,
+        HookManagerInterface $hookManager,
         LaravelConfiguration $configuration,
         LoggerInterface $logger,
         MeterInterface $meter,
@@ -37,7 +37,7 @@ public function instrument(
         $this->hookWorkerGetNextJob($hookManager, $tracer);
     }
 
-    private function hookWorkerProcess(HookManager $hookManager, TracerInterface $tracer): void
+    private function hookWorkerProcess(HookManagerInterface $hookManager, TracerInterface $tracer): void
     {
         $hookManager->hook(
             QueueWorker::class,
@@ -88,7 +88,7 @@ private function hookWorkerProcess(HookManager $hookManager, TracerInterface $tr
         );
     }
 
-    private function hookWorkerGetNextJob(HookManager $hookManager, TracerInterface $tracer): void
+    private function hookWorkerGetNextJob(HookManagerInterface $hookManager, TracerInterface $tracer): void
     {
         $hookManager->hook(
             QueueWorker::class,
diff --git a/src/Instrumentation/Laravel/src/LaravelConfiguration.php b/src/Instrumentation/Laravel/src/LaravelConfiguration.php
@@ -17,7 +17,7 @@ private function __construct(
     public static function fromArray(array $properties): self
     {
         return new self(
-            enabled: $properties['enabled'] ?? (class_exists(Sdk::class) ? !Sdk::isDisabled() : true),
+            enabled: (class_exists(Sdk::class) && !Sdk::isDisabled()) || $properties['enabled'],
         );
     }
 
diff --git a/src/Instrumentation/Laravel/src/LaravelInstrumentation.php b/src/Instrumentation/Laravel/src/LaravelInstrumentation.php
@@ -7,7 +7,7 @@
 use Nevay\SPI\ServiceLoader;
 use OpenTelemetry\API\Instrumentation\AutoInstrumentation\ConfigurationRegistry;
 use OpenTelemetry\API\Instrumentation\AutoInstrumentation\Context;
-use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManager;
+use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Instrumentation\AutoInstrumentation\Instrumentation;
 use OpenTelemetry\API\Instrumentation\ConfigurationResolver;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Hook;
@@ -17,7 +17,7 @@ class LaravelInstrumentation implements Instrumentation
 {
     public const INSTRUMENTATION_NAME = 'io.opentelemetry.contrib.php.laravel';
 
-    public function register(HookManager $hookManager, ConfigurationRegistry $configuration, Context $context): void
+    public function register(HookManagerInterface $hookManager, ConfigurationRegistry $configuration, Context $context): void
     {
         $config = $configuration->get(LaravelConfiguration::class) ?? LaravelConfiguration::default();
 
