fix T_EXIT parse error on PHP < 7

gooh · gooh · commit a50a8584b9cd · 2018-11-08T09:27:10.000+01:00
PHP &lt; 7 will treat Instana::exit() as if exit was T_EXIT instead of a
method name causing any PHP &lt; 7 to terminate with a parser error.
Calling the method via `call_user_func` works around this.

This commit also adds a method InstanaSpanType::exitType() for use in
consumer code using PHP &lt; 7.
diff --git a/src/Instana/OpenTracing/InstanaSpan.php b/src/Instana/OpenTracing/InstanaSpan.php
@@ -164,7 +164,7 @@ public function setTag($key, $value)
                         break;
                     case \OpenTracing\Tags\SPAN_KIND_RPC_CLIENT:
                     case \OpenTracing\Tags\SPAN_KIND_MESSAGE_BUS_PRODUCER:
-                        $this->spanType = InstanaSpanType::exit();
+			            $this->spanType = call_user_func(__NAMESPACE__ . '\InstanaSpanType::exit');
                         break;
                 }
                 break;
diff --git a/src/Instana/OpenTracing/InstanaSpanType.php b/src/Instana/OpenTracing/InstanaSpanType.php
@@ -59,6 +59,19 @@ public static function exit() {
         return self::$exit;
     }
 
+    /**
+     * Workaround for PHP < 7 where exit() is parsed as T_EXIT
+     *
+     * @return InstanaSpanType
+     * @deprecated Upgrade to PHP7 to use InstanaSpanType::exit()
+     */
+    public static function exitType() {
+        if (self::$exit === null) {
+            self::$exit = new InstanaSpanType(2, 'exit');
+        }
+        return self::$exit;
+    }
+
     /**
      * @return InstanaSpanType
      */
diff --git a/test/Instana/OpenTracing/InstanaHttpSpanFlusherTest.php b/test/Instana/OpenTracing/InstanaHttpSpanFlusherTest.php
@@ -167,8 +167,12 @@ public function startingActiveSpans()
 
         $child = \OpenTracing\GlobalTracer::get()->startActiveSpan('my_second_span');
         $child->getSpan()->setTag('bar', 2);
+        $child->close();
 
+        $child = \OpenTracing\GlobalTracer::get()->startActiveSpan('my_third_span');
+        $child->getSpan()->setTag('span.kind', 'client');
         $child->close();
+
         $parent->close();
 
         \OpenTracing\GlobalTracer::get()->flush();
@@ -193,6 +197,15 @@ public function startingActiveSpans()
             'duration' => $spanData[1]['duration'],
             'type' => 'LOCAL',
             'data' => ['bar' => 2]
+        ],[
+            'spanId' => $spanData[2]['spanId'],
+            'traceId' => $spanData[0]['traceId'],
+            'parentId' => $spanData[0]['spanId'],
+            'name' => 'my_third_span',
+            'timestamp' => $spanData[2]['timestamp'],
+            'duration' => $spanData[2]['duration'],
+            'type' => 'EXIT',
+            'data' => []
         ]], $spanData);
     }
 }
diff --git a/test/Instana/OpenTracing/InstanaSpanTypeTest.php b/test/Instana/OpenTracing/InstanaSpanTypeTest.php
@@ -38,4 +38,15 @@ public function verifyLocalReturnsSameInstanceAndHasCorrectTypeAndKind()
         $this->assertEquals(3, $exit->getKind());
         $this->assertEquals('local', $exit->getType());
     }
+
+    /**
+     * @test
+     */
+    public function verifyExitTypeReturnsSameInstanceAndHasCorrectTypeAndKind()
+    {
+        $exit = InstanaSpanType::exitType();
+        $this->assertSame($exit, InstanaSpanType::exitType());
+        $this->assertEquals(2, $exit->getKind());
+        $this->assertEquals('exit', $exit->getType());
+    }
 }
diff --git a/test/Instana/OpenTracing/InstanaTcpSpanFlusherTest.php b/test/Instana/OpenTracing/InstanaTcpSpanFlusherTest.php
@@ -148,8 +148,12 @@ public function startingActiveSpans()
 
             $child = \OpenTracing\GlobalTracer::get()->startActiveSpan('my_second_span');
             $child->getSpan()->setTag('bar', 2);
+            $child->close();
 
+            $child = \OpenTracing\GlobalTracer::get()->startActiveSpan('my_third_span');
+            $child->getSpan()->setTag('span.kind', 'client');
             $child->close();
+
             $parent->close();
 
             \OpenTracing\GlobalTracer::get()->flush();
@@ -197,6 +201,24 @@ public function startingActiveSpans()
                     ]
                 ]
             ]
+        ], [
+            's' => $spanData[2]['s'],
+            't' => $spanData[0]['t'],
+            'p' => $spanData[0]['s'],
+            'ta' => 'php',
+            'n' => 'sdk',
+            'ts' => $spanData[2]['ts'],
+            'd' => $spanData[2]['d'],
+            'k' => 2,
+            'data' => [
+                'sdk' => [
+                    'name' => 'my_third_span',
+                    'type' => 'exit',
+                    'custom' => [
+                        'tags' => []
+                    ]
+                ]
+            ]
         ]], $spanData);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public function setTag($key, $value)`
`164`	`164`	`break;`
`165`	`165`	`case \OpenTracing\Tags\SPAN_KIND_RPC_CLIENT:`
`166`	`166`	`case \OpenTracing\Tags\SPAN_KIND_MESSAGE_BUS_PRODUCER:`
`167`		`- $this->spanType = InstanaSpanType::exit();`
	`167`	`+ $this->spanType = call_user_func(__NAMESPACE__ . '\InstanaSpanType::exit');`
`168`	`168`	`break;`
`169`	`169`	`}`
`170`	`170`	`break;`