Laravel: use TextMapPropagatorInterface from InstrumentationContext i…

…nstead of Globals.
open-telemetry · Oct 26, 2024 · a3cf950 · a3cf950
1 parent 44440df
commit a3cf950
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/Instrumentation/Laravel/composer.json b/src/Instrumentation/Laravel/composer.json
@@ -12,7 +12,7 @@
     "php": "^8.1",
     "ext-json": "*",
     "laravel/framework": "^10.0 || ^11.0",
-    "open-telemetry/api": "^1.1",
+    "open-telemetry/api": "^1.1.1",
     "open-telemetry/sem-conv": "^1.24"
   },
   "require-dev": {

diff --git a/src/Instrumentation/Laravel/src/Hooks/Illuminate/Contracts/Http/Kernel.php b/src/Instrumentation/Laravel/src/Hooks/Illuminate/Contracts/Http/Kernel.php
@@ -7,7 +7,6 @@
 use Illuminate\Contracts\Http\Kernel as KernelContract;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
-use OpenTelemetry\API\Globals;
 use OpenTelemetry\API\Instrumentation\AutoInstrumentation\Context as InstrumentationContext;
 use OpenTelemetry\API\Instrumentation\AutoInstrumentation\HookManagerInterface;
 use OpenTelemetry\API\Trace\Span;
@@ -16,6 +15,7 @@
 use OpenTelemetry\API\Trace\StatusCode;
 use OpenTelemetry\API\Trace\TracerInterface;
 use OpenTelemetry\Context\Context;
+use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\Hook;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\Hooks\PostHookTrait;
 use OpenTelemetry\Contrib\Instrumentation\Laravel\LaravelInstrumentation;
@@ -40,15 +40,18 @@ public function instrument(
             schemaUrl: Version::VERSION_1_24_0->url(),
         );
 
-        $this->hookHandle($hookManager, $tracer);
+        $this->hookHandle($hookManager, $tracer, $context->propagator);
     }
 
-    protected function hookHandle(HookManagerInterface $hookManager, TracerInterface $tracer): void
-    {
+    protected function hookHandle(
+        HookManagerInterface $hookManager,
+        TracerInterface $tracer,
+        TextMapPropagatorInterface $propagator,
+    ): void {
         $hookManager->hook(
             KernelContract::class,
             'handle',
-            preHook: function (KernelContract $kernel, array $params, string $class, string $function, ?string $filename, ?int $lineno) use ($tracer) {
+            preHook: function (KernelContract $kernel, array $params, string $class, string $function, ?string $filename, ?int $lineno) use ($tracer, $propagator) {
                 $request = ($params[0] instanceof Request) ? $params[0] : null;
                 /** @psalm-suppress ArgumentTypeCoercion */
                 $builder = $tracer
@@ -61,7 +64,7 @@ protected function hookHandle(HookManagerInterface $hookManager, TracerInterface
                 $parent = Context::getCurrent();
                 if ($request) {
                     /** @phan-suppress-next-line PhanAccessMethodInternal */
-                    $parent = Globals::propagator()->extract($request, HeadersPropagator::instance());
+                    $parent = $propagator->extract($request, HeadersPropagator::instance());
                     $span = $builder
                         ->setParent($parent)
                         ->setAttribute(TraceAttributes::URL_FULL, $request->fullUrl())