Skip to content

Commit

Permalink
fix: use Object.entries in lieu of for...in to ensure we are iteratin…
Browse files Browse the repository at this point in the history
…g own properties only

Signed-off-by: Naseem <naseem@transit.app>
  • Loading branch information
Naseem committed Sep 11, 2020
1 parent f4624b0 commit 6570984
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packages/opentelemetry-core/src/utils/deep-merge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ export function deepMerge(
if (maxDepth === 0) {
throw new Error('Max depth exceeded.');
}
for (const prop in source) {
for (const [prop, value] of Object.entries(source)) {
if (bothPropsAreArrays(target, source, prop)) {
merged[prop] = [];
merged[prop] = source[prop];
merged[prop] = value;
} else if (bothPropsAreObjects(target, source, prop)) {
merged[prop] = deepMerge(target[prop], source[prop], maxDepth - 1);
merged[prop] = deepMerge(target[prop], value, maxDepth - 1);
} else {
merged[prop] = source[prop];
merged[prop] = value;
}
}
return merged;
Expand Down

0 comments on commit 6570984

Please sign in to comment.