chore: removed <20 to test out versioned tests on node 20

newrelic · Aug 14, 2023 · 67f2140 · 67f2140
1 parent 2b10589
commit 67f2140
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 60 deletions.
diff --git a/bin/run-versioned-tests.sh b/bin/run-versioned-tests.sh
@@ -61,6 +61,7 @@ if [ ! -z "$JOBS" ];
 then
   JOBS_ARGS="--jobs $JOBS"
 fi
+export NR_LOADER=./esm-loader.mjs
 
 if [[ "${NPM7}" = 1 ]];
 then

diff --git a/lib/esm-shim.mjs b/lib/esm-shim.mjs
diff --git a/lib/instrumentation/grpc-js/nr-hooks.js b/lib/instrumentation/grpc-js/nr-hooks.js
@@ -13,16 +13,19 @@ module.exports = [
   {
     type: 'generic',
     moduleName: '@grpc/grpc-js/build/src/resolving-call',
+    isEsm: true,
     onRequire: grpc.wrapStartResolve
   },
   {
     type: 'generic',
     moduleName: '@grpc/grpc-js/build/src/call-stream',
+    isEsm: true,
     onRequire: grpc.wrapStartCall
   },
   {
     type: 'web-framework',
     moduleName: '@grpc/grpc-js/build/src/server',
+    isEsm: true,
     onRequire: grpc.wrapServer
   }
 ]
diff --git a/lib/shimmer.js b/lib/shimmer.js
@@ -324,7 +324,7 @@ const shimmer = (module.exports = {
   registerCoreInstrumentation(agent) {
     // Instrument global.
     const globalShim = new shims.Shim(agent, 'globals', 'globals')
-    applyDebugState(globalShim, global)
+    applyDebugState(globalShim, global, false)
     const globalsFilepath = path.join(__dirname, 'instrumentation', 'core', 'globals.js')
     _firstPartyInstrumentation(agent, globalsFilepath, globalShim, global, 'globals')
 
@@ -340,7 +340,7 @@ const shimmer = (module.exports = {
       }
 
       const shim = shims.createShimFromType(core.type, agent, mojule, mojule)
-      applyDebugState(shim, core)
+      applyDebugState(shim, core, false)
       _firstPartyInstrumentation(agent, filePath, shim, uninstrumented, mojule)
     }
   },
@@ -355,9 +355,7 @@ const shimmer = (module.exports = {
       return _postLoad(agent, exports, name, basedir)
     })
     this._iitm = new IitmHook(pkgsToHook, function onESMHook(exports, name, basedir) {
-      // TOOD: if this is ESM it needs to be the export, otherwise it needs to be the
-      // default of the export
-      return _postLoad(agent, exports, name, basedir)
+      return _postLoad(agent, exports, name, basedir, true)
     })
   },
   removeHooks() {
@@ -460,16 +458,18 @@ const shimmer = (module.exports = {
   }
 })
 
-function applyDebugState(shim, nodule) {
+function applyDebugState(shim, nodule, inEsm) {
   if (shimmer.debug) {
     shim.enableDebug()
     instrumented.push(shim)
-    instrumented.push({
-      [symbols.unwrap]: function unwrapNodule() {
-        delete nodule[symbols.shim]
-      }
-    })
-    // nodule[symbols.shim] = shim
+    if (!inEsm) {
+      instrumented.push({
+        [symbols.unwrap]: function unwrapNodule() {
+          delete nodule[symbols.shim]
+        }
+      })
+      nodule[symbols.shim] = shim
+    }
   }
 }
 
@@ -482,8 +482,9 @@ function applyDebugState(shim, nodule) {
  * @param nodule
  * @param moduleName
  * @param resolvedName
+ * @param esmResolver
  */
-function instrumentPostLoad(agent, nodule, moduleName, resolvedName) {
+function instrumentPostLoad(agent, nodule, moduleName, resolvedName, esmResolver) {
   const instrumentations = shimmer.registeredInstrumentations[moduleName]
   instrumentations.forEach((instrumentation) => {
     if (
@@ -497,6 +498,8 @@ function instrumentPostLoad(agent, nodule, moduleName, resolvedName) {
       return
     }
 
+    const resolvedNodule = instrumentation.isEsm || !esmResolver ? nodule : nodule.default
+
     const shim = shims.createShimFromType(
       instrumentation.type,
       agent,
@@ -505,7 +508,7 @@ function instrumentPostLoad(agent, nodule, moduleName, resolvedName) {
       instrumentation.shimName
     )
 
-    applyDebugState(shim, nodule)
+    applyDebugState(shim, resolvedNodule, esmResolver)
     trackInstrumentationUsage(
       agent,
       shim,
@@ -522,7 +525,7 @@ function instrumentPostLoad(agent, nodule, moduleName, resolvedName) {
     }
 
     try {
-      if (instrumentation.onRequire(shim, nodule, moduleName) !== false) {
+      if (instrumentation.onRequire(shim, resolvedNodule, moduleName) !== false) {
         nodule = shim.getExport(nodule)
         instrumentation[symbols.instrumented] = true
       }
@@ -570,7 +573,7 @@ function _firstPartyInstrumentation(agent, fileName, shim, nodule, moduleName) {
   }
 }
 
-function _postLoad(agent, nodule, name, resolvedName) {
+function _postLoad(agent, nodule, name, resolvedName, esmResolver) {
   const instrumentation = shimmer.getInstrumentationNameFromModuleName(name)
   const registeredInstrumentation = shimmer.registeredInstrumentations[instrumentation]
   const hasPostLoadInstrumentation =
@@ -581,7 +584,7 @@ function _postLoad(agent, nodule, name, resolvedName) {
   // Check if this is a known instrumentation and then run it.
   if (hasPostLoadInstrumentation) {
     logger.trace('Instrumenting %s with onRequire (module loaded) hook.', name)
-    return instrumentPostLoad(agent, nodule, instrumentation, resolvedName)
+    return instrumentPostLoad(agent, nodule, instrumentation, resolvedName, esmResolver)
   }
 
   return nodule

diff --git a/test/versioned/esm-package/package.json b/test/versioned/esm-package/package.json
@@ -7,7 +7,7 @@
     "tests": [
       {
         "engines": {
-          "node": ">=16.12.0 <20"
+          "node": ">=16.12.0"
         },
         "dependencies": {
           "parse-json": "6.0.2"

diff --git a/test/versioned/esm-package/parse-json.tap.mjs b/test/versioned/esm-package/parse-json.tap.mjs
@@ -11,6 +11,7 @@ import parseJsonInstrumentation from './parse-json-instrumentation.mjs'
 shimmer.registerInstrumentation({
   moduleName: 'parse-json',
   type: 'generic',
+  isEsm: true,
   onRequire: parseJsonInstrumentation
 })
 

diff --git a/test/versioned/express-esm/package.json b/test/versioned/express-esm/package.json
@@ -6,7 +6,7 @@
   "tests": [
     {
       "engines": {
-        "node": ">=16.12.0 <20"
+        "node": ">=16.12.0"
       },
       "dependencies": {
         "express": ">=4.6.0",

diff --git a/test/versioned/grpc-esm/package.json b/test/versioned/grpc-esm/package.json
@@ -6,7 +6,7 @@
   "tests": [
     {
       "engines": {
-        "node": ">=16.12.0 <20"
+        "node": ">=16.12.0"
       },
       "dependencies": {
         "@grpc/grpc-js": ">=1.4.0"

diff --git a/test/versioned/mongodb-esm/package.json b/test/versioned/mongodb-esm/package.json
@@ -6,7 +6,7 @@
   "tests": [
     {
       "engines": {
-        "node": ">=16.12.0 <20"
+        "node": ">=16.12.0"
       },
       "dependencies": {
         "mongodb": ">=2.1 < 4.0.0 || >= 4.1.4 < 5"

diff --git a/test/versioned/pg-esm/package.json b/test/versioned/pg-esm/package.json
@@ -6,7 +6,7 @@
   "tests": [
     {
       "engines": {
-        "node": ">=16.12.0 <20"
+        "node": ">=16.12.0"
       },
       "dependencies": {
         "pg": ">=8.2 <8.8",
@@ -20,7 +20,7 @@
     },
     {
       "engines": {
-        "node": ">=16.12.0 <20"
+        "node": ">=16.12.0"
       },
       "dependencies": {
         "pg": ">=8.8",

diff --git a/third_party_manifest.json b/third_party_manifest.json
@@ -1,5 +1,5 @@
 {
-  "lastUpdated": "Fri Aug 11 2023 16:32:55 GMT-0400 (Eastern Daylight Time)",
+  "lastUpdated": "Mon Aug 14 2023 12:54:19 GMT-0400 (Eastern Daylight Time)",
   "projectName": "New Relic Node Agent",
   "projectUrl": "https://github.com/newrelic/node-newrelic",
   "includeOptDeps": true,