[PROF-411] Handle PHP7 case of Exceptions being string only in Profil…

…er::logException:
tideways · Jan 4, 2016 · 4275711 · 4275711
1 parent 973136a
commit 4275711
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/main/Tideways/Profiler.php b/src/main/Tideways/Profiler.php
@@ -793,9 +793,13 @@ public static function logFatal($message, $file, $line, $type = null, $trace = n
         ));
     }
 
-    public static function logException(\Exception $exception)
+    public static function logException($exception)
     {
-        if (self::$error === true || !self::$currentRootSpan) {
+        if (is_string($exception)) {
+            $exception = new \RuntimeException($exception);
+        }
+
+        if (self::$error === true || !self::$currentRootSpan || !($exception instanceof \Exception)) {
             return;
         }
 

diff --git a/tests/Tideways/ProfilerTest.php b/tests/Tideways/ProfilerTest.php
@@ -161,6 +161,23 @@ public function testLogExceptionPassedToTrace()
         \Tideways\Profiler::stop();
     }
 
+    public function testLogExceptionString()
+    {
+        $neverProfile = 0;
+
+        $backend = self::createBackend();
+        $backend->expects($this->once())->method('socketStore')->will($this->returnCallback(function($trace) {
+            $annotations = $trace['spans'][0]['a'];
+            $this->assertEquals('Error', $annotations['err_msg']);
+            $this->assertContains('Profiler.php', $annotations['err_source']);
+            $this->assertEquals('RuntimeException', $annotations['err_exception']);
+        }));
+
+        \Tideways\Profiler::start('foo', $neverProfile);
+        \Tideways\Profiler::logException("Error");
+        \Tideways\Profiler::stop();
+    }
+
     private function createBackend()
     {
         $backend = $this->getMock('Tideways\Profiler\Backend');