Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 10, 2025
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9c3ef6
chore: update package-loc file
david-luna Dec 11, 2024
f08f6e0
fix(rum-core): fix issue when merging RUM config
david-luna Dec 11, 2024
a9f17b7
fix(rum-core): fix merge of array props
david-luna Dec 13, 2024
2dfdda5
Merge branch 'main' of github.com:elastic/apm-agent-rum-js
david-luna Jan 7, 2025
68cdaa2
Merge branch 'main' into dluna-fix-merge-props-fun
david-luna Jan 7, 2025
3041889
Merge branch 'main' into dluna-fix-merge-props-fun
david-luna Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/rum-core/src/common/config-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,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])
}

Expand Down
12 changes: 7 additions & 5 deletions packages/rum-core/src/common/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,9 @@ function isFunction(value) {
return typeof value === 'function'
}

function baseExtend(dst, objs, deep) {
function baseExtend(objs, deep) {
var dst = Object.create(null)

for (var i = 0, ii = objs.length; i < ii; ++i) {
var obj = objs[i]
if (!isObject(obj) && !isFunction(obj)) continue
Expand Down Expand Up @@ -284,12 +286,12 @@ function getCurrentScript() {
}
}

function extend(dst) {
return baseExtend(dst, slice.call(arguments, 1), false)
function extend() {
return baseExtend(slice.call(arguments), false)
}

function merge(dst) {
return baseExtend(dst, slice.call(arguments, 1), true)
function merge() {
return baseExtend(slice.call(arguments), true)
}

function isUndefined(obj) {
Expand Down
2 changes: 1 addition & 1 deletion packages/rum-core/src/performance-monitoring/span-base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading