chore: fixes from comments

instana · Oct 4, 2024 · e14825c · e14825c
1 parent dba9389
commit e14825c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/collector/test/tracing/misc/node-fetch/app.js b/packages/collector/test/tracing/misc/node-fetch/app.js
@@ -39,8 +39,8 @@ app.get('/', async (req, res) => {
 });
 
 app.get('/request', async (req, res) => {
-  log('Received request /request');
   await fetch(`http://127.0.0.1:${agentPort}`);
+
   res.json({});
 });
 

diff --git a/packages/collector/test/tracing/misc/typescript/ts_esm/ts_esm_test.js b/packages/collector/test/tracing/misc/typescript/ts_esm/ts_esm_test.js
@@ -11,6 +11,10 @@ const config = require('@instana/core/test/config');
 const ProcessControls = require('../../../../test_util/ProcessControls');
 const globalAgent = require('../../../../globalAgent');
 const testUtils = require('@instana/core/test/test_util');
+const isLatestEsmSupportedVersion = require('@instana/core').tracing.isLatestEsmSupportedVersion;
+const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
+  ? ['--import', path.join(__dirname, 'node_modules', '@instana', 'collector', 'esm-register.mjs')]
+  : ['--experimental-loader', path.join(__dirname, 'node_modules', '@instana', 'collector', 'esm-loader.mjs')];
 
 describe('Typescript TS->ESM', function () {
   this.timeout(config.getTestTimeout() * 5);
@@ -35,7 +39,7 @@ describe('Typescript TS->ESM', function () {
       controls = new ProcessControls({
         appPath: path.join(__dirname, 'dist', 'app_1.js'),
         useGlobalAgent: true,
-        execArgv: ['--import', path.join(__dirname, 'node_modules', '@instana', 'collector', 'esm-register.mjs')]
+        execArgv: loaderPath
       });
 
       await controls.startAndWaitForAgentConnection();
@@ -78,7 +82,7 @@ describe('Typescript TS->ESM', function () {
       controls = new ProcessControls({
         appPath: path.join(__dirname, 'dist', 'app_2.js'),
         useGlobalAgent: true,
-        execArgv: ['--import', path.join(__dirname, 'node_modules', '@instana', 'collector', 'esm-register.mjs')]
+        execArgv: loaderPath
       });
 
       await controls.startAndWaitForAgentConnection();