From 9c427fe8a9c1bb4da80bcf9c74c3f269eb45d83a Mon Sep 17 00:00:00 2001
From: Gert Hengeveld <info@ghengeveld.nl>
Date: Thu, 23 Jun 2022 23:01:50 +0200
Subject: [PATCH] Fix bubbling multiple levels

---
 lib/instrumenter/src/instrumenter.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/instrumenter/src/instrumenter.ts b/lib/instrumenter/src/instrumenter.ts
index 16562248790..dc9a1f0b2a0 100644
--- a/lib/instrumenter/src/instrumenter.ts
+++ b/lib/instrumenter/src/instrumenter.ts
@@ -450,7 +450,9 @@ export class Instrumenter {
 
         // Exceptions inside callbacks should bubble up to the parent call.
         if (call.ancestors.length) {
-          Object.defineProperty(e, 'callId', { value: call.id });
+          if (!Object.prototype.hasOwnProperty.call(e, 'callId')) {
+            Object.defineProperty(e, 'callId', { value: call.id });
+          }
           throw e;
         }