Skip to content

Commit b74b590

Browse files
committed
fix onrequire wrapping
1 parent 38f2b4b commit b74b590

File tree

1 file changed

+4
-6
lines changed
  • packages/datadog-instrumentations/src/helpers

1 file changed

+4
-6
lines changed

packages/datadog-instrumentations/src/helpers/hook.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict'
22
const path = require('path')
3-
const Module = require('module')
43
const iitm = require('../../../dd-trace/src/iitm')
54
const ritm = require('../../../dd-trace/src/ritm')
65

@@ -29,13 +28,12 @@ function Hook (modules, hookOptions, onrequire) {
2928

3029
let defaultWrapResult
3130

32-
const original = onrequire
33-
onrequire = (moduleExports, ...args) => {
31+
const wrappedOnrequire = (moduleExports, ...args) => {
3432
if (this._patched[filename] && patched.has(moduleExports)) {
3533
return patched.get(moduleExports)
3634
}
3735

38-
const result = original(moduleExports, ...args)
36+
const result = onrequire(moduleExports, ...args)
3937
if (result && (typeof result === 'object' || typeof result === 'function')) {
4038
patched.set(moduleExports, result)
4139
patched.set(result, result)
@@ -50,10 +48,10 @@ function Hook (modules, hookOptions, onrequire) {
5048
(typeof moduleExports.default === 'object' ||
5149
typeof moduleExports.default === 'function')
5250
) {
53-
defaultWrapResult = onrequire(moduleExports.default, moduleName, moduleBaseDir, moduleVersion, isIitm)
51+
defaultWrapResult = wrappedOnrequire(moduleExports.default, moduleName, moduleBaseDir, moduleVersion, isIitm)
5452
}
5553

56-
const newExports = onrequire(moduleExports, moduleName, moduleBaseDir, moduleVersion, isIitm)
54+
const newExports = wrappedOnrequire(moduleExports, moduleName, moduleBaseDir, moduleVersion, isIitm)
5755

5856
if (defaultWrapResult) newExports.default = defaultWrapResult
5957

0 commit comments

Comments
 (0)