From e14825c6d9aecf8de942f8af19b0fd2e9fa495d2 Mon Sep 17 00:00:00 2001 From: kirrg001 Date: Fri, 4 Oct 2024 12:27:40 +0200 Subject: [PATCH] chore: fixes from comments --- packages/collector/test/tracing/misc/node-fetch/app.js | 2 +- .../test/tracing/misc/typescript/ts_esm/ts_esm_test.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/collector/test/tracing/misc/node-fetch/app.js b/packages/collector/test/tracing/misc/node-fetch/app.js index f2e036b94c..37a69d66a9 100644 --- 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 index d07c379c1b..e0f9ed0ffa 100644 --- 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();