share traceid with logs

src/Facades/Tracer.php

@@ -21,6 +21,7 @@
  * @method static SpanBuilder newSpan(string $name)
  * @method static SpanInterface start(string $name)
  * @method static mixed measure(string $name, Closure $callback)
+ * @method static void updateLogContext()
  */
 class Tracer extends Facade
 {

src/Instrumentation/QueueInstrumentation.php

@@ -41,6 +41,8 @@ protected function recordJobStart(): void
                 ->startSpan();
 
             $span->activate();
+
+            Tracer::updateLogContext();
         });
     }
 

src/Support/HttpServer/TraceRequestMiddleware.php

@@ -24,6 +24,8 @@ public function handle(Request $request, Closure $next): mixed
         $span = $this->startTracing($request);
         $scope = $span->activate();
 
+        Tracer::updateLogContext();
+
         try {
             $response = $next($request);
 

src/Tracer.php

@@ -43,9 +43,9 @@ public function start(string $name): SpanInterface
      *
      * @param  non-empty-string  $name
      * @param  Closure(SpanInterface $span): U  $callback
+     * @throws \Throwable
      * @return (U is PendingDispatch ? null : U)
      *
-     * @throws \Throwable
      */
     public function measure(string $name, Closure $callback)
     {
@@ -101,14 +101,14 @@ public function isRecording(): bool
         return false;
     }
 
-    //    protected function setTraceIdForLogs(SpanInterface $span): void
-    //    {
-    //        if (config('opentelemetry.logs.inject_trace_id', true)) {
-    //            $field = config('opentelemetry.logs.trace_id_field', 'traceId');
-    //
-    //            Log::shareContext([
-    //                $field => $span->getContext()->getTraceId(),
-    //            ]);
-    //        }
-    //    }
+    public function updateLogContext(): void
+    {
+        if (config('opentelemetry.logs.inject_trace_id', true)) {
+            $field = config('opentelemetry.logs.trace_id_field', 'traceId');
+
+            Log::shareContext([
+                $field => $this->traceId(),
+            ]);
+        }
+    }
 }

tests/Instrumentation/HttpServerInstrumentationTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
 use Keepsuit\LaravelOpenTelemetry\Facades\Tracer;
 use Keepsuit\LaravelOpenTelemetry\Instrumentation\HttpServerInstrumentation;
@@ -46,6 +47,10 @@
             'http.response.status_code' => 200,
             'http.response.body.size' => 32,
         ]);
+
+    expect(Log::sharedContext())->toMatchArray([
+        'traceId' => $traceId,
+    ]);
 });
 
 it('can record route exception', function () {

tests/Instrumentation/QueueInstrumentationTest.php

@@ -42,5 +42,6 @@
 
     expect($this->valuestore)
         ->get('traceparentInJob')->toBe(sprintf('00-%s-%s-01', $traceId, $spanId))
-        ->get('traceIdInJob')->toBe($traceId);
+        ->get('traceIdInJob')->toBe($traceId)
+        ->get('logContextInJob')->toMatchArray(['traceId' => $traceId]);
 });

tests/Support/TestJob.php

@@ -7,6 +7,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 use Keepsuit\LaravelOpenTelemetry\Facades\Tracer;
 use Spatie\Valuestore\Valuestore;
 
@@ -18,9 +19,10 @@ public function __construct(protected Valuestore $valuestore)
     {
     }
 
-    public function handle()
+    public function handle(): void
     {
         $this->valuestore->put('traceparentInJob', $this->job->payload()['traceparent'] ?? null);
         $this->valuestore->put('traceIdInJob', Tracer::traceId());
+        $this->valuestore->put('logContextInJob', Log::sharedContext());
     }
 }

tests/TracerTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Log;
 use Keepsuit\LaravelOpenTelemetry\Facades\Tracer;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\SpanKind;
@@ -228,3 +229,20 @@
     $scope->detach();
     $span->end();
 });
+
+it('set traceId to log context', function () {
+    $span = Tracer::start('test span');
+    $scope = $span->activate();
+
+    expect(Log::sharedContext())->toBe([]);
+
+    Tracer::updateLogContext();
+
+    expect(Log::sharedContext())
+        ->toMatchArray([
+            'traceId' => $span->getContext()->getTraceId(),
+        ]);
+
+    $scope->detach();
+    $span->end();
+});