Merge pull request #144 from bizob2828/moar-shim-fixes

updated tests to include shimName when registering instrumentation. also updated index.js to include shimName as that was missed from last time
newrelic · Apr 19, 2023 · cacbb6b · cacbb6b
2 parents 80f4d7d + fa5b4af
commit cacbb6b
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -11,6 +11,18 @@
  * then the supportability metrics for custom instrumentation will trigger.
  */
 const newrelic = require('newrelic')
-newrelic.instrumentWebframework('koa', require('./lib/instrumentation'))
-newrelic.instrumentWebframework('koa-route', require('./lib/route-instrumentation'))
-newrelic.instrumentWebframework('koa-router', require('./lib/router-instrumentation'))
+newrelic.instrumentWebframework({
+  moduleName: 'koa',
+  onRequire: require('./lib/instrumentation'),
+  shimName: 'koa'
+})
+newrelic.instrumentWebframework({
+  moduleName: 'koa-route',
+  onRequire: require('./lib/route-instrumentation'),
+  shimName: 'koa'
+})
+newrelic.instrumentWebframework({
+  moduleName: 'koa-router',
+  onRequire: require('./lib/router-instrumentation'),
+  shimName: 'koa'
+})
diff --git a/tests/unit/koa.tap.js b/tests/unit/koa.tap.js
@@ -18,7 +18,8 @@ tap.test('Koa instrumentation', function (t) {
   helper.registerInstrumentation({
     moduleName: 'koa',
     type: 'web-framework',
-    onRequire: require('../../lib/instrumentation')
+    onRequire: require('../../lib/instrumentation'),
+    shimName: 'koa'
   })
   const Koa = require('koa')
   const shim = helper.getShim()

diff --git a/tests/unit/route.tap.js b/tests/unit/route.tap.js
@@ -19,7 +19,8 @@ tap.test('koa-route', function (t) {
   helper.registerInstrumentation({
     type: 'web-framework',
     moduleName: 'koa-route',
-    onRequire: require('../../lib/route-instrumentation.js')
+    onRequire: require('../../lib/route-instrumentation.js'),
+    shimName: 'koa'
   })
 
   const shim = helper.getShim()

diff --git a/tests/unit/router.tap.js b/tests/unit/router.tap.js
@@ -34,7 +34,8 @@ koaRouterMods.forEach((koaRouterMod) => {
     helper.registerInstrumentation({
       type: 'web-framework',
       moduleName: koaRouterMod,
-      onRequire: instrumentation
+      onRequire: instrumentation,
+      shimName: 'koa'
     })
 
     t.test('mounting paramware', function (t) {

diff --git a/tests/versioned/code-level-metrics.tap.js b/tests/versioned/code-level-metrics.tap.js
@@ -36,14 +36,16 @@ async function setupApp({ useKoaRouter, useAtKoaRouter, isCLMEnabled }) {
   helper.registerInstrumentation({
     moduleName: 'koa',
     type: 'web-framework',
-    onRequire: require('../../lib/instrumentation')
+    onRequire: require('../../lib/instrumentation'),
+    shimName: 'koa'
   })
 
   if (useKoaRouter) {
     helper.registerInstrumentation({
       moduleName: 'koa-router',
       type: 'web-framework',
-      onRequire: require('../../lib/router-instrumentation')
+      onRequire: require('../../lib/router-instrumentation'),
+      shimName: 'koa'
     })
 
     const Router = require('koa-router')
@@ -54,7 +56,8 @@ async function setupApp({ useKoaRouter, useAtKoaRouter, isCLMEnabled }) {
     helper.registerInstrumentation({
       moduleName: '@koa/router',
       type: 'web-framework',
-      onRequire: require('../../lib/router-instrumentation')
+      onRequire: require('../../lib/router-instrumentation'),
+      shimName: 'koa'
     })
     const Router = require('@koa/router')
     router = new Router()

diff --git a/tests/versioned/koa-v1.tap.js b/tests/versioned/koa-v1.tap.js
@@ -19,7 +19,8 @@ tap.test('Koa v1', function (t) {
   helper.registerInstrumentation({
     moduleName: 'koa',
     type: 'web-framework',
-    onRequire: require('../../lib/instrumentation')
+    onRequire: require('../../lib/instrumentation'),
+    shimName: 'koa'
   })
   var koa = require('koa')
   app = koa()

diff --git a/tests/versioned/koa.tap.js b/tests/versioned/koa.tap.js
@@ -23,7 +23,8 @@ tap.test('Koa instrumentation', (t) => {
     helper.registerInstrumentation({
       moduleName: 'koa',
       type: 'web-framework',
-      onRequire: require('../../lib/instrumentation')
+      onRequire: require('../../lib/instrumentation'),
+      shimName: 'koa'
     })
     const Koa = require('koa')
     app = new Koa()