support context on exception

packaged · Nov 20, 2024 · 4eef9ad · 4eef9ad
1 parent 96d0eb0
commit 4eef9ad
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/Log.php b/src/Log.php
@@ -77,26 +77,26 @@ public static function debug($message, array $context = [])
     self::_getLogger()->debug($message, $context);
   }
 
-  public static function exception(Throwable $e)
+  public static function exception(Throwable $e, array $context = [])
   {
     static::critical(
       $e->getMessage(),
-      [
+      $context + [
         'code' => $e->getCode(),
         'file' => $e->getFile(),
         'line' => $e->getLine(),
       ]
     );
   }
 
-  public static function exceptionWithTrace(Throwable $e)
+  public static function exceptionWithTrace(Throwable $e, array $context = [])
   {
     static::critical(
       $e->getMessage(),
-      [
-        'code' => $e->getCode(),
-        'file' => $e->getFile(),
-        'line' => $e->getLine(),
+      $context + [
+        'code'        => $e->getCode(),
+        'file'        => $e->getFile(),
+        'line'        => $e->getLine(),
         'stack_trace' => $e->getTraceAsString(),
       ]
     );

diff --git a/tests/BasicGoogleCloudLoggerTest.php b/tests/BasicGoogleCloudLoggerTest.php
@@ -98,11 +98,12 @@ public function testExceptionTraceLog()
     Log::bind($this->_getTestLogger());
 
     $e = new Exception('exception message', 123);
-    Log::exceptionWithTrace($e);
+    Log::exceptionWithTrace($e, ['extra' => 'additional']);
     self::assertContains('"textPayload":"exception message"', $this->_getLogContents());
     self::assertContains('"severity":"critical"', $this->_getLogContents());
     self::assertContains('"code":123', $this->_getLogContents());
     self::assertContains('"line":100', $this->_getLogContents());
+    self::assertContains('"extra":"additional"', $this->_getLogContents());
     self::assertContains('BasicGoogleCloudLoggerTest.php', $this->_getLogContents());
     self::assertContains('"stack_trace"', $this->_getLogContents());
   }

diff --git a/tests/ErrorLogLoggerTest.php b/tests/ErrorLogLoggerTest.php
@@ -100,10 +100,11 @@ public function testExceptionTraceLog()
     Log::bind(new ErrorLogLogger());
 
     $e = new Exception('exception message', 123);
-    Log::exceptionWithTrace($e);
+    Log::exceptionWithTrace($e, ['extra' => 'additional']);
     self::assertContains('[critical] exception message ', $this->_getLogContents());
     self::assertContains('"code":123', $this->_getLogContents());
     self::assertContains('"line":102', $this->_getLogContents());
+    self::assertContains('"extra":"additional"', $this->_getLogContents());
     self::assertContains('ErrorLogLoggerTest.php', $this->_getLogContents());
     self::assertContains('"stack_trace"', $this->_getLogContents());
   }

diff --git a/tests/StdOutLoggerTest.php b/tests/StdOutLoggerTest.php
@@ -100,10 +100,11 @@ public function testExceptionTraceLog()
     Log::bind($this->_getTestLogger());
 
     $e = new Exception('exception message', 123);
-    Log::exceptionWithTrace($e);
+    Log::exceptionWithTrace($e, ['extra' => 'additional']);
     self::assertContains('[CRITICAL] exception message ', $this->_getLogContents());
     self::assertContains('"code":123', $this->_getLogContents());
     self::assertContains('"line":102', $this->_getLogContents());
+    self::assertContains('"extra":"additional"', $this->_getLogContents());
     self::assertContains('StdOutLoggerTest.php', $this->_getLogContents());
     self::assertContains('"stack_trace"', $this->_getLogContents());
   }