Skip to content

chore: prevent most double wrapping in shimmer #7051

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

Draft
BridgeAR wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

chore: prevent most double wrapping in shimmer #7051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions packages/datadog-shimmer/src/shimmer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ const skipMethodSize = skipMethods.size

const nonConfigurableModuleExports = new WeakMap()

const safetyMap = new WeakMap()

/**
* Copies properties from the original function to the wrapped function.
*
Expand Down Expand Up @@ -75,8 +77,17 @@ function copyObjectProperties (original, wrapped, skipKey) {
function wrapFunction (original, wrapper) {
if (typeof original !== 'function') return original

// Safe guard: If the wrapper is identical, we double wrap.
// This will not catch all types of double wrapping, just most.
const oldWrapper = safetyMap.get(original)
if (oldWrapper === wrapper) {
return original
}

const wrapped = wrapper(original)

safetyMap.set(wrapped, wrapper)

if (typeof original === 'function') {
assertNotClass(original)
copyProperties(original, wrapped)
Expand Down Expand Up @@ -138,8 +149,16 @@ function wrap (target, name, wrapper, options) {

assertMethod(target, name, original)

// Safe guard: If the wrapper is identical, we double wrap.
// This will not catch all types of double wrapping, just most.
const oldWrapper = safetyMap.get(original)
if (oldWrapper === wrapper) {
return
}
const wrapped = wrapper(original)

safetyMap.set(wrapped, wrapper)

copyProperties(original, wrapped)

if (descriptor.writable) {
Expand Down