Added parent trace ID

Author: andrey-helldar

composer.json

@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": "^8.2",
-        "dragon-code/request-tracker": "^1.1",
+        "dragon-code/request-tracker": "^1.4",
         "illuminate/http": "^11.0 || ^12.0 || ^13.0",
         "illuminate/support": "^11.0 || ^12.0 || ^13.0"
     },

src/Helpers/ContextHelper.php

@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\LaravelRequestTracker\Helpers;
+
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Facades\Context;
+
+class ContextHelper implements Arrayable
+{
+    protected ?string $userId = null;
+
+    protected ?string $ip = null;
+
+    protected ?string $traceId = null;
+
+    public function userId(?string $id): static
+    {
+        $this->userId = $id;
+
+        return $this;
+    }
+
+    public function ip(?string $ip): static
+    {
+        $this->ip = $ip;
+
+        return $this;
+    }
+
+    public function traceId(?string $id): static
+    {
+        $this->traceId = $id;
+
+        return $this;
+    }
+
+    public function toArray(): array
+    {
+        $result = [];
+
+        if ($this->userId) {
+            $result['userId'] = $this->userId;
+        }
+
+        if ($this->ip) {
+            $result['ip'] = $this->ip;
+        }
+
+        if ($this->traceId) {
+            $result['traceId'] = $this->traceId;
+        }
+
+        if ($trace = $this->getParentTraceId()) {
+            $result['parentTraceId'] = $trace;
+        }
+
+        return $result;
+    }
+
+    public function store(): void
+    {
+        Context::add(TrackerConfig::contextKey(), $this->toArray());
+    }
+
+    protected function getParentTraceId(): ?string
+    {
+        $context = Context::get(TrackerConfig::contextKey(), []);
+
+        if ($parent = $context['parentTraceId'] ?? null) {
+            return $parent;
+        }
+
+        $trace = $context['traceId'] ?? null;
+
+        return $trace === $this->traceId ? null : $trace;
+    }
+}

src/Http/Middleware/RequestTrackerMiddleware.php

@@ -5,11 +5,11 @@
 namespace DragonCode\LaravelRequestTracker\Http\Middleware;
 
 use Closure;
+use DragonCode\LaravelRequestTracker\Helpers\ContextHelper;
 use DragonCode\LaravelRequestTracker\Helpers\TrackerConfig;
 use DragonCode\RequestTracker\TrackerHeader;
 use DragonCode\RequestTracker\TrackerRequest;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Context;
 use Symfony\Component\HttpFoundation\Response;
 
 class RequestTrackerMiddleware
@@ -54,10 +54,10 @@ protected function headers(): TrackerHeader
 
     protected function context(TrackerRequest $request): void
     {
-        Context::add(TrackerConfig::contextKey(), [
-            'userId'  => $request->getUserId(),
-            'ip'      => $request->getIp(),
-            'traceId' => $request->getTraceId(),
-        ]);
+        (new ContextHelper)
+            ->userId($request->getUserId())
+            ->ip($request->getIp())
+            ->traceId($request->getTraceId())
+            ->store();
     }
 }

src/LaravelRequestTrackerServiceProvider.php

@@ -4,7 +4,9 @@
 
 namespace DragonCode\LaravelRequestTracker;
 
+use DragonCode\LaravelRequestTracker\Helpers\ContextHelper;
 use DragonCode\LaravelRequestTracker\Http\Middleware\RequestTrackerMiddleware;
+use DragonCode\RequestTracker\TrackerUuid;
 use Illuminate\Support\ServiceProvider;
 
 class LaravelRequestTrackerServiceProvider extends ServiceProvider
@@ -20,6 +22,7 @@ public function register(): void
     {
         $this->registerConfig();
         $this->registerMiddleware();
+        $this->registerTrackingData();
     }
 
     protected function registerConfig(): void
@@ -38,4 +41,11 @@ protected function registerMiddleware(): void
             $router->prependMiddlewareToGroup($name, RequestTrackerMiddleware::class);
         }
     }
+
+    protected function registerTrackingData(): void
+    {
+        (new ContextHelper)
+            ->traceId(TrackerUuid::get())
+            ->store();
+    }
 }

tests/Feature/MiddlewareTest.php

@@ -35,11 +35,13 @@ function (Request $request) use (&$captured): Response {
 
     expect($context)
         ->toBeArray()
-        ->toHaveKeys(['userId', 'ip', 'traceId']);
+        ->toHaveKeys(['ip', 'traceId', 'parentTraceId'])
+        ->not
+        ->toHaveKey('userId');
 
-    expect($context['userId'])->toBeEmpty();
     expect($context['ip'])->toBe('198.51.100.42');
-    expect($context['traceId'])->toBe($trace);
+    expect($context['traceId'])->toBeUuid()->toBe($trace);
+    expect($context['parentTraceId'])->toBeUuid();
 });
 
 it('uses authenticated user id when available', function () {
@@ -76,8 +78,8 @@ function (Request $request) use (&$captured): Response {
     $middleware = new RequestTrackerMiddleware;
 
     $existing = [
-        'X-Tracker-User-Id'  => '777',
-        'X-Tracker-Ip'       => '192.0.2.55',
+        'X-Tracker-User-Id' => '777',
+        'X-Tracker-Ip' => '192.0.2.55',
         'X-Tracker-Trace-Id' => (string) Str::uuid(),
     ];
 
@@ -101,4 +103,5 @@ function (Request $request) use (&$captured): Response {
     expect($context['userId'])->toBe('777');
     expect($context['ip'])->toBe('192.0.2.55');
     expect($context['traceId'])->toBe($existing['X-Tracker-Trace-Id']);
+    expect($context['parentTraceId'])->toBeUuid();
 });