Abstract active span management

Author: allflame

src/Span/SpanAwareInterface.php

@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Span;
+
+interface SpanAwareInterface
+{
+    public function getSpan(): ?SpanInterface;
+}

src/Span/SpanManagerInterface.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+
+namespace Jaeger\Span;
+
+use Jaeger\Span\Context\ContextAwareInterface;
+use Jaeger\Tracer\InjectableInterface;
+use Jaeger\Tracer\ResettableInterface;
+
+interface SpanManagerInterface extends ContextAwareInterface,
+                                       InjectableInterface,
+                                       ResettableInterface,
+                                       SpanAwareInterface
+{
+    public function new(SpanInterface $span);
+
+    public function finish(SpanInterface $span): ?SpanInterface;
+}

src/Span/SpanManager.php src/Span/StackSpanManager.phpsrc/Span/SpanManager.php renamed to src/Span/StackSpanManager.php

@@ -3,12 +3,11 @@
 
 namespace Jaeger\Span;
 
-use Jaeger\Span\Context\ContextAwareInterface;
 use Jaeger\Span\Context\SpanContext;
 use Jaeger\Tracer\InjectableInterface;
 use Jaeger\Tracer\ResettableInterface;
 
-class SpanManager implements InjectableInterface, ContextAwareInterface, ResettableInterface
+class StackSpanManager implements SpanManagerInterface
 {
     private $stack;
 
@@ -64,12 +63,12 @@ public function getSpan(): ?SpanInterface
         return $this->stack->count() ? $this->stack->top() : null;
     }
 
-    public function push(SpanInterface $span): void
+    public function new(SpanInterface $span): void
     {
         $this->stack->push($span);
     }
 
-    public function pop(): ?SpanInterface
+    public function finish(SpanInterface $span): ?SpanInterface
     {
         return $this->stack->count() ? $this->stack->pop() : null;
     }

src/Tracer/Tracer.php

@@ -8,7 +8,7 @@
 use Jaeger\Span\Context\SpanContext;
 use Jaeger\Span\Factory\SpanFactoryInterface;
 use Jaeger\Span\SpanInterface;
-use Jaeger\Span\SpanManager;
+use Jaeger\Span\SpanManagerInterface;
 
 class Tracer implements
     TracerInterface,
@@ -26,7 +26,7 @@ class Tracer implements
 
     private $client;
 
-    public function __construct(SpanManager $manager, SpanFactoryInterface $factory, ClientInterface $client)
+    public function __construct(SpanManagerInterface $manager, SpanFactoryInterface $factory, ClientInterface $client)
     {
         $this->manager = $manager;
         $this->factory = $factory;
@@ -83,7 +83,7 @@ public function getClient(): ClientInterface
     public function debug(string $operationName, array $tags = []): SpanInterface
     {
         $span = $this->factory->parent($this, $operationName, str_shuffle('01234567890abcdef'), $tags);
-        $this->manager->push($span);
+        $this->manager->new($span);
 
         return $span;
     }
@@ -95,7 +95,7 @@ public function start(string $operationName, array $tags = [], SpanContext $user
         } else {
             $span = $this->factory->child($this, $operationName, $context, $tags);
         }
-        $this->manager->push($span);
+        $this->manager->new($span);
 
         return $span;
     }
@@ -112,7 +112,7 @@ public function finish(SpanInterface $span, int $duration = 0): void
 
             return;
         }
-        $this->manager->pop();
+        $this->manager->finish($span);
         if (false === $span->isSampled()) {
             return;
         }