From 359fe76f04e7a4829402bbae00037b113f85b5e5 Mon Sep 17 00:00:00 2001
From: Daniel Morell <daniel@cairntek.com>
Date: Fri, 15 Dec 2023 15:05:42 -0600
Subject: [PATCH 1/2] Fixed #631 Log message in description

---
 src/DataBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DataBuilder.php b/src/DataBuilder.php
index 291f6426..62f25b98 100644
--- a/src/DataBuilder.php
+++ b/src/DataBuilder.php
@@ -470,8 +470,8 @@ public function makeTrace(
 
         $excInfo = new ExceptionInfo(
             $classOverride ?: get_class($exception),
-            $exception->getMessage(),
-            $message
+            $message,
+            $exception->getMessage()
         );
         return new Trace($frames, $excInfo);
     }

From 59e0360e74c958ef708562065441bb07a6d2835b Mon Sep 17 00:00:00 2001
From: Daniel Morell <daniel@cairntek.com>
Date: Fri, 22 Dec 2023 13:15:25 -0600
Subject: [PATCH 2/2] Fixed #631 Set log message as primary

---
 src/DataBuilder.php       | 21 ++++++++++++++-------
 tests/DataBuilderTest.php |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/DataBuilder.php b/src/DataBuilder.php
index 62f25b98..4096d5a5 100644
--- a/src/DataBuilder.php
+++ b/src/DataBuilder.php
@@ -462,18 +462,25 @@ public function makeTrace(
         ?string $classOverride = null,
         string|Stringable $message = null,
     ): Trace {
+        $frames = array();
         if ($this->captureErrorStacktraces) {
             $frames = $this->makeFrames($exception, $includeContext);
-        } else {
-            $frames = array();
+        }
+        
+        $exceptionMessage = $exception->getMessage();
+        $description = $message;
+
+        // If a message is explicitly set when calling the logger, use that. Otherwise, use the exception's message.
+        if (null !== $message) {
+            $exceptionMessage = $message;
+            $description = $exception->getMessage();
         }
 
-        $excInfo = new ExceptionInfo(
+        return new Trace($frames, new ExceptionInfo(
             $classOverride ?: get_class($exception),
-            $message,
-            $exception->getMessage()
-        );
-        return new Trace($frames, $excInfo);
+            $exceptionMessage,
+            $description,
+        ));
     }
 
     public function makeFrames($exception, $includeContext)
diff --git a/tests/DataBuilderTest.php b/tests/DataBuilderTest.php
index ea2b7a12..5e7b3172 100644
--- a/tests/DataBuilderTest.php
+++ b/tests/DataBuilderTest.php
@@ -706,8 +706,8 @@ public function testExceptionInContext(): void
         $this->assertSame(
             array(
                 'class'       => 'Exception',
-                'message'     => 'testing exception',
-                'description' => 'testing',
+                'message'     => 'testing',
+                'description' => 'testing exception',
             ),
             $output['body']['trace']['exception'],
         );