Merge pull request #2 from Vinelab/graceful_inject

Define errors out of existence
Vinelab · Aug 27, 2019 · b50987e · b50987e
2 parents 9374389 + 8d0a221
commit b50987e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 24 deletions.
diff --git a/src/Drivers/Null/NullTracer.php b/src/Drivers/Null/NullTracer.php
@@ -7,7 +7,6 @@
 use Vinelab\Tracing\Contracts\Span;
 use Vinelab\Tracing\Contracts\SpanContext;
 use Vinelab\Tracing\Contracts\Tracer;
-use Vinelab\Tracing\Exceptions\MissingTraceContextException;
 
 class NullTracer implements Tracer
 {
@@ -97,12 +96,6 @@ public function extract($carrier, string $format): ?SpanContext
      */
     public function inject($carrier, string $format)
     {
-        $span = $this->getCurrentSpan();
-
-        if (!$span) {
-            throw new MissingTraceContextException('Cannot obtain context because there is no active span');
-        }
-
         return $carrier;
     }
 

diff --git a/src/Drivers/Zipkin/ZipkinTracer.php b/src/Drivers/Zipkin/ZipkinTracer.php
@@ -20,7 +20,6 @@
 use Vinelab\Tracing\Drivers\Zipkin\Injectors\TextMapInjector;
 use Vinelab\Tracing\Drivers\Zipkin\Injectors\VinelabHttpInjector;
 use Vinelab\Tracing\Drivers\Zipkin\Injectors\ZipkinInjector;
-use Vinelab\Tracing\Exceptions\MissingTraceContextException;
 use Vinelab\Tracing\Exceptions\UnregisteredFormatException;
 use Vinelab\Tracing\Exceptions\UnresolvedCollectorIpException;
 use Vinelab\Tracing\Propagation\Formats;
@@ -241,14 +240,12 @@ public function inject($carrier, string $format)
     {
         $span = $this->getCurrentSpan();
 
-        if (!$span) {
-            throw new MissingTraceContextException('Cannot obtain context because there is no active span');
+        if ($span) {
+            $this->resolveInjector($format)
+                ->setPropagation($this->tracing->getPropagation())
+                ->inject($span->getContext(), $carrier);
         }
 
-        $this->resolveInjector($format)
-            ->setPropagation($this->tracing->getPropagation())
-            ->inject($span->getContext(), $carrier);
-
         return $carrier;
     }
 

diff --git a/src/Exceptions/MissingTraceContextException.php b/src/Exceptions/MissingTraceContextException.php