From 50739c5bc43e26491c9a84e8bb7fa326b094a94e Mon Sep 17 00:00:00 2001
From: Nikolay Savinov <aldouswhite@gmail.com>
Date: Mon, 30 Mar 2020 13:17:51 +0300
Subject: [PATCH 1/4] Update JaegerPropagator.php

in 2.1.1-beta extract method can return null instead of SpanContext class
---
 src/Jaeger/Propagator/JaegerPropagator.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Jaeger/Propagator/JaegerPropagator.php b/src/Jaeger/Propagator/JaegerPropagator.php
index 763435f..74c9efb 100644
--- a/src/Jaeger/Propagator/JaegerPropagator.php
+++ b/src/Jaeger/Propagator/JaegerPropagator.php
@@ -86,6 +86,9 @@ public function extract($format, $carrier){
             }
         }
 
+        if ($spanContext === null) {
+            return new SpanContext(0, 0, 0, null, 0);
+        }
 
         return $spanContext;
     }

From fc54bb03d0343b409ac1931131ca0ebbdc958545 Mon Sep 17 00:00:00 2001
From: Nikolay Savinov <aldouswhite@gmail.com>
Date: Mon, 30 Mar 2020 13:59:38 +0300
Subject: [PATCH 2/4] Update JaegerPropagatorTest.php

---
 tests/Propagator/JaegerPropagatorTest.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/Propagator/JaegerPropagatorTest.php b/tests/Propagator/JaegerPropagatorTest.php
index 937a4e7..c483b31 100644
--- a/tests/Propagator/JaegerPropagatorTest.php
+++ b/tests/Propagator/JaegerPropagatorTest.php
@@ -148,13 +148,4 @@ public function testExtractPsr7(){
         $this->assertTrue($context->spanId == 1562237095801441413);
         $this->assertTrue($context->flags == 1);
     }
-
-
-    public function testExtractReturnsNull(){
-        $jaeger = new JaegerPropagator();
-        $carrier = [];
-
-        $context = $jaeger->extract(Formats\TEXT_MAP, $carrier);
-        $this->assertNull($context);
-    }
 }

From d500a86953405b741f4a7b56e7684baac81af71c Mon Sep 17 00:00:00 2001
From: Nikolay Savinov <aldouswhite@gmail.com>
Date: Mon, 30 Mar 2020 14:09:33 +0300
Subject: [PATCH 3/4] Update JaegerPropagatorTest.php

---
 tests/Propagator/JaegerPropagatorTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/Propagator/JaegerPropagatorTest.php b/tests/Propagator/JaegerPropagatorTest.php
index c483b31..abe3d36 100644
--- a/tests/Propagator/JaegerPropagatorTest.php
+++ b/tests/Propagator/JaegerPropagatorTest.php
@@ -148,4 +148,12 @@ public function testExtractPsr7(){
         $this->assertTrue($context->spanId == 1562237095801441413);
         $this->assertTrue($context->flags == 1);
     }
+    
+    public function testExtractReturnsNull(){
+        $jaeger = new JaegerPropagator();
+        $carrier = [];
+
+        $context = $jaeger->extract(Formats\TEXT_MAP, $carrier);
+        $this->assertInstanceOf(\Jaeger\SpanContext::class, $context);
+    }
 }

From f44aed57a24e3668d427f48baf2fd64b4f4be52b Mon Sep 17 00:00:00 2001
From: Nikolay Savinov <aldouswhite@gmail.com>
Date: Mon, 30 Mar 2020 14:26:55 +0300
Subject: [PATCH 4/4] Update JaegerPropagatorTest.php

---
 tests/Propagator/JaegerPropagatorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Propagator/JaegerPropagatorTest.php b/tests/Propagator/JaegerPropagatorTest.php
index abe3d36..b1d14cb 100644
--- a/tests/Propagator/JaegerPropagatorTest.php
+++ b/tests/Propagator/JaegerPropagatorTest.php
@@ -149,7 +149,7 @@ public function testExtractPsr7(){
         $this->assertTrue($context->flags == 1);
     }
     
-    public function testExtractReturnsNull(){
+    public function testExtractReturnsSpanContext(){
         $jaeger = new JaegerPropagator();
         $carrier = [];