fix: update tracing and span logic

Author: AdilAzhari

src/Tracing/SpanScope.php

@@ -6,6 +6,7 @@
 
 use LaravelTrace\LaravelTrace\Context\TraceContext;
 use LaravelTrace\LaravelTrace\Span\Span;
+use Throwable;
 
 final class SpanScope
 {
@@ -22,16 +23,42 @@ public function span(): Span
         return $this->span;
     }
 
-    public function close(): void
+    public function close(): Span
     {
         if ($this->closed) {
-            return;
+            return $this->span;
         }
 
         $this->closed = true;
 
+        $completed = $this->tracer->complete(
+            $this->span,
+        );
+
         $this->tracer->setContext(
             $this->previousContext,
         );
+
+        return $completed;
+    }
+
+    public function fail(Throwable $exception): Span
+    {
+        if ($this->closed) {
+            return $this->span;
+        }
+
+        $this->closed = true;
+
+        $failed = $this->tracer->fail(
+            $this->span,
+            $exception,
+        );
+
+        $this->tracer->setContext(
+            $this->previousContext,
+        );
+
+        return $failed;
     }
 }

src/Tracing/Tracer.php

@@ -4,6 +4,7 @@
 
 namespace LaravelTrace\LaravelTrace\Tracing;
 
+use DateTimeImmutable;
 use LaravelTrace\LaravelTrace\Context\TraceContext;
 use LaravelTrace\LaravelTrace\Contracts\TraceContextStore;
 use LaravelTrace\LaravelTrace\Contracts\Tracer as TracerContract;
@@ -20,7 +21,15 @@ public function __construct(
 
     public function start(string $name): Trace
     {
-        return Trace::start($name);
+        $trace = Trace::start($name);
+
+        $this->setContext(
+            new TraceContext(
+                traceId: $trace->id,
+            ),
+        );
+
+        return $trace;
     }
 
     public function span(
@@ -67,4 +76,18 @@ public function clearContext(): void
     {
         $this->contextStore->clear();
     }
+
+    public function complete(Span $span): Span
+    {
+        return $span->complete(
+            new DateTimeImmutable,
+        );
+    }
+
+    public function fail(Span $span): Span
+    {
+        return $span->fail(
+            new DateTimeImmutable,
+        );
+    }
 }

tests/Unit/Context/TraceContextTest.php

@@ -51,7 +51,7 @@
 });
 
 it('sets the trace context when starting a trace', function () {
-    $store = new InMemoryTraceContextStore();
+    $store = new InMemoryTraceContextStore;
     $tracer = new Tracer($store);
 
     $trace = $tracer->start('CreateOrder');

tests/Unit/Span/SpanTest.php

@@ -49,3 +49,45 @@
         ->and($child->parentId)
         ->toBe($parent->id);
 });
+
+it('completes a span', function () {
+    $traceId = TraceId::generate();
+
+    $span = Span::start(
+        traceId: $traceId,
+        name: 'ReserveInventory',
+        type: SpanType::Action,
+    );
+
+    $finishedAt = new DateTimeImmutable;
+
+    $completed = $span->complete($finishedAt);
+
+    expect($completed->status)
+        ->toBe(SpanStatus::Completed)
+        ->and($completed->finishedAt)
+        ->toBe($finishedAt)
+        ->and($span->status)
+        ->toBe(SpanStatus::Running);
+});
+
+it('fails a span', function () {
+    $traceId = TraceId::generate();
+
+    $span = Span::start(
+        traceId: $traceId,
+        name: 'ReserveInventory',
+        type: SpanType::Action,
+    );
+
+    $finishedAt = new DateTimeImmutable;
+
+    $failed = $span->fail($finishedAt);
+
+    expect($failed->status)
+        ->toBe(SpanStatus::Failed)
+        ->and($failed->finishedAt)
+        ->toBe($finishedAt)
+        ->and($span->status)
+        ->toBe(SpanStatus::Running);
+});

tests/Unit/Tracing/SpanScopeTest.php

@@ -4,11 +4,10 @@
 
 use LaravelTrace\LaravelTrace\Context\InMemoryTraceContextStore;
 use LaravelTrace\LaravelTrace\Span\SpanType;
-use LaravelTrace\LaravelTrace\Tracing\SpanScope;
 use LaravelTrace\LaravelTrace\Tracing\Tracer;
 
 it('restores the previous context when closed', function () {
-    $store = new InMemoryTraceContextStore();
+    $store = new InMemoryTraceContextStore;
     $tracer = new Tracer($store);
 
     $tracer->start('CreateOrder');

tests/Unit/Tracing/TracerTest.php

@@ -2,13 +2,16 @@
 
 declare(strict_types=1);
 
+use LaravelTrace\LaravelTrace\Context\InMemoryTraceContextStore;
 use LaravelTrace\LaravelTrace\Span\SpanStatus;
 use LaravelTrace\LaravelTrace\Span\SpanType;
 use LaravelTrace\LaravelTrace\Trace\TraceStatus;
 use LaravelTrace\LaravelTrace\Tracing\Tracer;
 
-it('starts a trace', function (): void {
-    $tracer = new Tracer;
+it('starts a trace', function () {
+    $tracer = new Tracer(
+        new InMemoryTraceContextStore(),
+    );
 
     $trace = $tracer->start('CreateOrder');
 
@@ -18,17 +21,20 @@
         ->toBe(TraceStatus::Running);
 });
 
-it('starts a span inside a trace', function (): void {
-    $tracer = new Tracer;
+it('starts a span inside a trace', function () {
+    $tracer = new Tracer(
+        new InMemoryTraceContextStore(),
+    );
 
     $trace = $tracer->start('CreateOrder');
 
-    $span = $tracer->startSpan(
-        trace: $trace,
-        name: 'ReserveInventory',
-        type: SpanType::Action,
+    $scope = $tracer->span(
+        'ReserveInventory',
+        SpanType::Action,
     );
 
+    $span = $scope->span();
+
     expect($span->traceId)
         ->toBe($trace->id)
         ->and($span->name)