fix(shared-metrics): fixed package.json not being found when app is E…

…SM (#749)

- there was another case for esm apps
- you can either pass --experimental-loader={VAL} or --experimental-loader {VAL}

packages/core/src/util/applicationUnderMonitoring.js

@@ -146,8 +146,10 @@ function getMainPackageJsonPathStartingAtDirectory(startDirectory, cb) {
         (process._preload_modules && process._preload_modules.length > 0) ||
         (process.execArgv &&
           process.execArgv.length > 0 &&
-          process.execArgv[0].indexOf('--experimental-loader') !== -1 &&
-          process.execArgv[0].indexOf('esm-loader.mjs') !== -1)
+          ((process.execArgv[0].indexOf('--experimental-loader') !== -1 &&
+            process.execArgv[0].indexOf('esm-loader.mjs')) !== -1 ||
+            (process.execArgv[0].indexOf('--experimental-loader') !== -1 &&
+              process.execArgv[1].indexOf('esm-loader.mjs') !== -1)))
       ) {
         // @ts-ignore
         mainModule = {

packages/shared-metrics/.gitignore

@@ -2,3 +2,6 @@
 !test/util/dependencies_test_dir_02/node_modules/**
 !test/util/dependencies_test_dir_03/node_modules
 !test/util/dependencies_test_dir_03/node_modules/**
+!test/esm-loader/module/node_modules
+!test/esm-loader/module-2/node_modules
+!test/esm-loader/module-3/node_modules

packages/shared-metrics/test/esm-loader/module-2/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "esm-loader-2",
+  "version": "1.0.0",
+  "description": "",
+  "dependencies": {}
+}

packages/shared-metrics/test/esm-loader/module-2/src/app.mjs

@@ -0,0 +1,26 @@
+/*
+ * (c) Copyright IBM Corp. 2023
+ */
+
+'use strict';
+
+import express from 'express';
+
+const port = process.env.APP_PORT || 44004;
+const app = express();
+const logPrefix = `EJS preload collector: (${process.pid}):\t`;
+
+app.get('/', (req, res) => {
+  res.send('OK');
+});
+
+app.listen(port, () => {
+  log(`Listening on port: ${port}`);
+});
+
+function log() {
+  const args = Array.prototype.slice.call(arguments);
+  args[0] = `${logPrefix} (${process.pid}):\t${args[0]}`;
+  // eslint-disable-next-line no-console
+  console.log.apply(console, args);
+}

packages/shared-metrics/test/esm-loader/module-3/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "esm-loader-3",
+  "version": "1.0.0",
+  "description": "",
+  "dependencies": {}
+}

packages/shared-metrics/test/esm-loader/module/src/app.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright IBM Corp. 2022
+ * (c) Copyright IBM Corp. 2023
  */
 
 'use strict';

packages/shared-metrics/test/esm-loader/test.js

@@ -18,24 +18,70 @@ const ProcessControls = require('../../../collector/test/test_util/ProcessContro
 const mochaSuiteFn = semver.gte(process.versions.node, '12.0.0') ? describe : describe.skip;
 
 mochaSuiteFn('ESM loader', function () {
-  this.timeout(config.getTestTimeout());
+  describe('case 1', function () {
+    this.timeout(config.getTestTimeout());
 
-  const controls = new ProcessControls({
-    useGlobalAgent: true,
-    cwd: path.join(__dirname, 'module'),
-    appPath: path.join(__dirname, 'module', 'src', 'app'),
-    execArgv: ['--experimental-loader=../../../../collector/esm-loader.mjs']
+    const controls = new ProcessControls({
+      useGlobalAgent: true,
+      cwd: path.join(__dirname, 'module'),
+      appPath: path.join(__dirname, 'module', 'src', 'app'),
+      execArgv: ['--experimental-loader=../../../../collector/esm-loader.mjs']
+    });
+
+    ProcessControls.setUpHooks(controls);
+
+    it('should be able to find package.json', async () => {
+      await testUtils.retry(() =>
+        controls.agentControls.getAllMetrics(controls.getPid()).then(metrics => {
+          const name = findMetric(metrics, ['name']);
+          expect(name).to.equal('esm-loader');
+        })
+      );
+    });
   });
 
-  ProcessControls.setUpHooks(controls);
+  describe('case 2', function () {
+    this.timeout(config.getTestTimeout());
+
+    const controls = new ProcessControls({
+      useGlobalAgent: true,
+      cwd: path.join(__dirname, 'module'),
+      appPath: path.join(__dirname, 'module-2', 'src', 'app.mjs'),
+      execArgv: ['--experimental-loader', './../../../../collector/esm-loader.mjs']
+    });
+
+    ProcessControls.setUpHooks(controls);
+
+    it('should be able to find package.json', async () => {
+      await testUtils.retry(() =>
+        controls.agentControls.getAllMetrics(controls.getPid()).then(metrics => {
+          const name = findMetric(metrics, ['name']);
+          expect(name).to.equal('esm-loader-2');
+        })
+      );
+    });
+  });
+
+  describe('case 3', function () {
+    this.timeout(config.getTestTimeout());
+
+    const controls = new ProcessControls({
+      useGlobalAgent: true,
+      cwd: path.join(__dirname, 'module'),
+      appPath: path.join(__dirname, 'module-3', 'node_modules', 'my-app', 'server.mjs'),
+      execArgv: ['--experimental-loader', './../../../../collector/esm-loader.mjs']
+    });
+
+    ProcessControls.setUpHooks(controls);
 
-  it('should be able to find package.json', async () => {
-    await testUtils.retry(() =>
-      controls.agentControls.getAllMetrics(controls.getPid()).then(metrics => {
-        const name = findMetric(metrics, ['name']);
-        expect(name).to.equal('@instana/shared-metrics');
-      })
-    );
+    it('should be able to find package.json', async () => {
+      await testUtils.retry(() =>
+        controls.agentControls.getAllMetrics(controls.getPid()).then(metrics => {
+          const name = findMetric(metrics, ['name']);
+          expect(name).to.equal('my-app');
+        })
+      );
+    });
   });
 });