Bumps to OpenTracing 1.0.0-beta5.

composer.json

@@ -18,7 +18,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": "^5.6||^7.0",
-        "opentracing/opentracing": "1.0.0-beta4",
+        "opentracing/opentracing": "1.0.0-beta5",
         "symfony/polyfill": "~1.7.0",
         "guzzlehttp/psr7": "^1.4@dev",
         "psr/log": "^1.0@dev"

src/DDTrace/Scope.php

@@ -3,6 +3,7 @@
 namespace DDTrace;
 
 use OpenTracing\Scope as OpenTracingScope;
+use OpenTracing\Span as OpenTracingSpan;
 
 final class Scope implements OpenTracingScope
 {
@@ -16,17 +17,27 @@ final class Scope implements OpenTracingScope
      */
     private $scopeManager;
 
-    public function __construct(ScopeManager $scopeManager, Span $span)
+    /**
+     * @var bool
+     */
+    private $finishSpanOnClose;
+
+    public function __construct(ScopeManager $scopeManager, OpenTracingSpan $span, $finishSpanOnClose)
     {
         $this->scopeManager = $scopeManager;
         $this->span = $span;
+        $this->finishSpanOnClose = $finishSpanOnClose;
     }
 
     /**
      * {@inheritdoc}
      */
     public function close()
     {
+        if ($this->finishSpanOnClose) {
+            $this->span->finish();
+        }
+
         $this->scopeManager->deactivate($this);
     }
 

src/DDTrace/ScopeManager.php

@@ -17,9 +17,11 @@ final class ScopeManager implements OpenTracingScopeManager
      * {@inheritdoc}
      * @param Span|OpenTracingSpan $span
      */
-    public function activate(OpenTracingSpan $span)
+    public function activate(OpenTracingSpan $span, $finishSpanOnClose)
     {
-        $this->scopes[] = new Scope($this, $span);
+        $scope = new Scope($this, $span, $finishSpanOnClose);
+        $this->scopes[] = $scope;
+        return $scope;
     }
 
     /**
@@ -34,23 +36,6 @@ public function getActive()
         return $this->scopes[count($this->scopes) - 1];
     }
 
-    /**
-     * {@inheritdoc}
-     * @param Span $span
-     */
-    public function getScope(OpenTracingSpan $span)
-    {
-        $scopeLength = count($this->scopes);
-
-        for ($i = 0; $i < $scopeLength; $i++) {
-            if ($span === $this->scopes[$i]->getSpan()) {
-                return $this->scopes[$i];
-            }
-        }
-
-        return null;
-    }
-
     public function deactivate(Scope $scope)
     {
         $scopeLength = count($this->scopes);

src/DDTrace/Tracer.php

@@ -11,7 +11,7 @@
 use OpenTracing\NoopSpan;
 use OpenTracing\Reference;
 use OpenTracing\SpanContext as OpenTracingContext;
-use OpenTracing\SpanOptions;
+use OpenTracing\StartSpanOptions;
 use OpenTracing\Tracer as OpenTracingTracer;
 use OpenTracing\Formats;
 
@@ -58,7 +58,6 @@ final class Tracer implements OpenTracingTracer
     private $scopeManager;
 
     /**
-     * Tracer constructor.
      * @param Transport $transport
      * @param Propagator[] $propagators
      * @param array $config
@@ -95,8 +94,8 @@ public function startSpan($operationName, $options = [])
             return NoopSpan::create();
         }
 
-        if (!($options instanceof SpanOptions)) {
-            $options = SpanOptions::create($options);
+        if (!($options instanceof StartSpanOptions)) {
+            $options = StartSpanOptions::create($options);
         }
 
         $reference = $this->findParent($options->getReferences());
@@ -131,8 +130,8 @@ public function startSpan($operationName, $options = [])
      */
     public function startActiveSpan($operationName, $options = [])
     {
-        if (!($options instanceof SpanOptions)) {
-            $options = SpanOptions::create($options);
+        if (!($options instanceof StartSpanOptions)) {
+            $options = StartSpanOptions::create($options);
         }
 
         if (($activeSpan = $this->getActiveSpan()) !== null) {
@@ -141,9 +140,7 @@ public function startActiveSpan($operationName, $options = [])
 
         $span = $this->startSpan($operationName, $options);
 
-        $this->scopeManager->activate($span);
-
-        return $span;
+        return $this->scopeManager->activate($span, $options->shouldFinishSpanOnClose());
     }
 
     /**

tests/Unit/ScopeManagerTest.php

@@ -22,35 +22,31 @@ public function testActivateSuccess()
         $tracer = new Tracer(new NoopTransport);
         $span = $tracer->startSpan(self::OPERATION_NAME);
         $scopeManager = new ScopeManager();
-        $scopeManager->activate($span);
+        $scopeManager->activate($span, false);
         $this->assertSame($span, $scopeManager->getActive()->getSpan());
     }
 
     public function testGetScopeReturnsNull()
     {
         $tracer = new Tracer(new NoopTransport);
-        $span = $tracer->startSpan(self::OPERATION_NAME);
-        $scopeManager = new ScopeManager();
-        $this->assertNull($scopeManager->getScope($span));
+        $tracer->startSpan(self::OPERATION_NAME);
+        $this->assertNull($tracer->getScopeManager()->getActive());
     }
 
     public function testGetScopeSuccess()
     {
         $tracer = new Tracer(new NoopTransport);
         $span = $tracer->startSpan(self::OPERATION_NAME);
-        $scopeManager = new ScopeManager();
-        $scopeManager->activate($span);
-        $scope = $scopeManager->getScope($span);
-        $this->assertSame($span, $scope->getSpan());
+        $scope = $tracer->getScopeManager()->activate($span, false);
+        $this->assertSame($scope, $tracer->getScopeManager()->getActive());
     }
 
     public function testDeactivateSuccess()
     {
         $tracer = new Tracer(new NoopTransport);
         $span = $tracer->startSpan(self::OPERATION_NAME);
         $scopeManager = new ScopeManager();
-        $scopeManager->activate($span);
-        $scope = $scopeManager->getScope($span);
+        $scope = $scopeManager->activate($span, false);
         $scopeManager->deactivate($scope);
         $this->assertNull($scopeManager->getActive());
     }

tests/Unit/ScopeTest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace DDTrace\Tests\Unit;
+
+use DDTrace\Scope;
+use DDTrace\ScopeManager;
+use OpenTracing\Span;
+use PHPUnit_Framework_TestCase;
+
+final class ScopeTest extends PHPUnit_Framework_TestCase
+{
+    public function testScopeFinishesSpanOnClose()
+    {
+        $span = $this->prophesize(Span::class);
+        $span->finish()->shouldBeCalled();
+        $scope = new Scope(new ScopeManager(), $span->reveal(), true);
+        $scope->close();
+    }
+
+    public function testScopeDoesNotFinishesSpanOnClose()
+    {
+        $span = $this->prophesize(Span::class);
+        $span->finish()->shouldNotBeCalled();
+        $scope = new Scope(new ScopeManager(), $span->reveal(), false);
+        $scope->close();
+    }
+}

tests/Unit/TracerTest.php

@@ -56,17 +56,17 @@ public function testStartSpanAsChild()
     public function testStartActiveSpan()
     {
         $tracer = new Tracer(new NoopTransport);
-        $span = $tracer->startActiveSpan(self::OPERATION_NAME);
-        $this->assertEquals($span, $tracer->getActiveSpan());
+        $scope = $tracer->startActiveSpan(self::OPERATION_NAME);
+        $this->assertEquals($scope, $tracer->getScopeManager()->getActive());
     }
 
     public function testStartActiveSpanAsChild()
     {
         $tracer = new Tracer(new NoopTransport);
-        $parentSpan = $tracer->startActiveSpan(self::OPERATION_NAME);
-        $childSpan = $tracer->startActiveSpan(self::ANOTHER_OPERATION_NAME);
-        $this->assertEquals($childSpan, $tracer->getActiveSpan());
-        $this->assertEquals($parentSpan->getSpanId(), $childSpan->getParentId());
+        $parentScope = $tracer->startActiveSpan(self::OPERATION_NAME);
+        $childScope = $tracer->startActiveSpan(self::ANOTHER_OPERATION_NAME);
+        $this->assertEquals($childScope, $tracer->getScopeManager()->getActive());
+        $this->assertEquals($parentScope->getSpan()->getSpanId(), $childScope->getSpan()->getParentId());
     }
 
     public function testInjectThrowsUnsupportedFormatException()