fix(rum-core): fix for merge utility function (#1555)

elastic · Jan 10, 2025 · 0d1eda5 · 0d1eda5
1 parent 274fca3
commit 0d1eda5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/rum-core/src/common/config-service.js b/packages/rum-core/src/common/config-service.js
@@ -190,7 +190,7 @@ class Config {
         Math.round(transactionSampleRate * 10000) / 10000
     }
 
-    merge(this.config, properties)
+    this.config = merge(this.config, properties)
     this.events.send(CONFIG_CHANGE, [this.config])
   }
 

diff --git a/packages/rum-core/src/common/utils.js b/packages/rum-core/src/common/utils.js
@@ -284,12 +284,12 @@ function getCurrentScript() {
   }
 }
 
-function extend(dst) {
-  return baseExtend(dst, slice.call(arguments, 1), false)
+function extend() {
+  return baseExtend(Object.create(null), slice.call(arguments), false)
 }
 
-function merge(dst) {
-  return baseExtend(dst, slice.call(arguments, 1), true)
+function merge() {
+  return baseExtend(Object.create(null), slice.call(arguments), true)
 }
 
 function isUndefined(obj) {

diff --git a/packages/rum-core/src/performance-monitoring/span-base.js b/packages/rum-core/src/performance-monitoring/span-base.js
@@ -77,7 +77,7 @@ class SpanBase {
   addContext(...context) {
     if (context.length === 0) return
     this.ensureContext()
-    merge(this.context, ...context)
+    this.context = merge(this.context, ...context)
   }
 
   end(endTime) {

diff --git a/packages/rum-core/src/performance-monitoring/transaction.js b/packages/rum-core/src/performance-monitoring/transaction.js
@@ -88,7 +88,7 @@ class Transaction extends SpanBase {
       // is not setting explicitly the threshold and instead expecting to rely on the one by default.
       this.options.reuseThreshold = options.reuseThreshold
 
-      extend(this.options, options)
+      this.options = extend(this.options, options)
     }
   }