Merge branch '2.0.x' into 1.0.x

allflame · allflame · commit 7634c6ca1856 · 2018-04-06T19:24:15.000+03:00
diff --git a/src/Bridge/BackgroundSpanHandler.php b/src/Bridge/BackgroundSpanHandler.php
@@ -38,6 +38,11 @@ public function start(Request $request)
 
     public function finish()
     {
+        if (null === $this->span) {
+            return $this;
+        }
+        $this->tracer->finish($this->span);
 
+        return $this;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,11 @@ public function start(Request $request)`
`38`	`38`
`39`	`39`	`public function finish()`
`40`	`40`	`{`
	`41`	`+ if (null === $this->span) {`
	`42`	`+ return $this;`
	`43`	`+ }`
	`44`	`+ $this->tracer->finish($this->span);`
`41`	`45`
	`46`	`+ return $this;`
`42`	`47`	`}`
`43`	`48`	`}`