linked errors with transactions

Author: alash3al

src/Agent.php

@@ -194,8 +194,15 @@ public function getTransaction(string $name)
      */
     public function captureThrowable(\Throwable $thrown, array $context = [], ?Transaction $transaction = null)
     {
+        $err = $this->eventFactory->createError($thrown, array_replace_recursive($this->sharedContext, $context), $transaction);
+
+        if ( ! empty($transaction) ) {
+            $transaction->addError($err);
+            return;
+        }
+
         $this->errorsStore->register(
-            $this->eventFactory->createError($thrown, array_replace_recursive($this->sharedContext, $context), $transaction)
+            $err
         );
     }
 

src/Events/Error.php

@@ -37,7 +37,7 @@ public function __construct(\Throwable $throwable, array $contexts, ?Transaction
      */
     public function jsonSerialize() : array
     {
-        return [
+        $result = [
             'id'        => $this->getId(),
             'timestamp' => $this->getTimestamp(),
             'context'   => $this->getContext(),
@@ -53,6 +53,14 @@ public function jsonSerialize() : array
                 'name'  => 'error',
             ]
         ];
+
+        if ( ! empty($this->transaction) ) {
+            $result['transaction_id'] = $this->transaction->getId();
+            $result['parent_id'] = $this->transaction->getId();
+            $result['trace_id'] = $this->transaction->getId();
+        }
+
+        return $result;
     }
 
     /**
@@ -83,11 +91,6 @@ private function mapStacktrace() : array
             if (isset($trace['class']) === true) {
                 $item['module'] = $trace['class'];
             }
-<<<<<<< HEAD
-
-=======
-
->>>>>>> 8fce808847143baef99f86062797fc11da580da0
             if (isset($trace['type']) === true) {
                 $item['type'] = $trace['type'];
             }

src/Events/EventBean.php

@@ -25,6 +25,13 @@ class EventBean
      */
     private $timestamp;
 
+    /**
+     * The parent transaction
+     *
+     * @var Transaction
+     */
+    protected $transaction;
+
     /**
      * Event Metadata
      *
@@ -72,6 +79,7 @@ public function __construct(array $contexts, ?Transaction $transaction = null)
         $timestamp = \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true)));
         $timestamp->setTimeZone(new \DateTimeZone('UTC'));
         $this->timestamp = $timestamp->format('Y-m-d\TH:i:s.u\Z');
+        $this->transaction = $transaction;
     }
 
     /**

src/Events/Transaction.php

@@ -45,6 +45,13 @@ class Transaction extends EventBean implements \JsonSerializable
      */
     private $spans = [];
 
+    /**
+     * The errors for the transaction
+     *
+     * @var array
+     */
+    private $errors = [];
+
     /**
      * Backtrace Depth
      *
@@ -137,6 +144,21 @@ public function setSpans(array $spans)
         $this->spans = $spans;
     }
 
+    public function addError(Error $error)
+    {
+        $this->errors[] = $error;
+    }
+
+    public function setErrors(array $errors)
+    {
+        $this->errors = $errors;
+    }
+
+    public function getErrors()
+    {
+        return $this->errors ?? [];
+    }
+
     /**
      * Set the Max Depth/Limit of the debug_backtrace method
      *
@@ -181,6 +203,7 @@ public function jsonSerialize() : array
           'result'    => $this->getMetaResult(),
           'context'   => $this->getContext(),
           'spans'     => $this->getSpans(),
+          'errors'    => $this->getErrors(),
           'processor' => [
               'event' => 'transaction',
               'name'  => 'transaction',

src/Middleware/Connector.php

@@ -81,6 +81,7 @@ public function sendTransactions(TransactionsStore $store) : bool
      */
     public function sendErrors(ErrorsStore $store) : bool
     {
+        // dd($this->buildEventPayload(new Errors($this->config, $store), 'errors', 'error'));
         $response = $this->client->post($this->getEndpoint(), [
             'headers' => $this->getRequestHeaders(),
             'body' => $this->buildEventPayload(new Errors($this->config, $store), 'errors', 'error')
@@ -104,12 +105,19 @@ private function buildEventPayload(Entity $entity, string $extractEvent, string
 
         foreach ( $data[$extractEvent]->list() as $item ) {
             $obj = $item->jsonSerialize();
+            $errors = $obj['errors'] ?? [];
             $spans = $obj['spans'] ?? [];
 
-            unset($obj['spans']);
+            unset($obj['spans'], $obj['errors']);
 
             $body .= "\n" . json_encode([$as => $item]);
 
+            if ( !empty($errors) ) {
+                foreach ( $errors as $i => $error ) {
+                    $body .= "\n" . json_encode(['error' => $error]);
+                }
+            }
+
             if ( !empty($spans) ) {
                 foreach ( $spans as $i => $span ) {
                     $span = array_merge($span, [