test: esm version check removed

aryamohanan · aryamohanan · commit 1448aac1b830 · 2025-11-14T13:08:03.000+05:30
diff --git a/packages/aws-fargate/test/Control.js b/packages/aws-fargate/test/Control.js
@@ -13,7 +13,6 @@ const config = require('@instana/core/test/config');
 const AbstractServerlessControl = require('../../serverless/test/util/AbstractServerlessControl');
 const portfinder = require('../../collector/test/test_util/portfinder');
 const PATH_TO_INSTANA_FARGATE_PACKAGE = path.join(__dirname, '..');
-const isLatestEsmSupportedVersion = require('@instana/core').util.esm.isLatestEsmSupportedVersion;
 let execArg;
 
 function Control(opts) {
@@ -99,9 +98,7 @@ Control.prototype.startMonitoredProcess = function startMonitoredProcess() {
     env.INSTANA_AGENT_KEY = this.instanaAgentKey;
   }
 
-  const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
-    ? ['--import', `${path.join(__dirname, '..', 'esm-register.mjs')}`]
-    : [`--experimental-loader=${path.join(__dirname, '..', 'esm-loader.mjs')}`];
+  const loaderPath = ['--import', `${path.join(__dirname, '..', 'esm-register.mjs')}`];
 
   if (this.opts.containerAppPath && this.opts.env && this.opts.env.ESM_TEST) {
     if (this.opts.containerAppPath.endsWith('.mjs')) {
diff --git a/packages/azure-container-services/test/Control.js b/packages/azure-container-services/test/Control.js
@@ -10,7 +10,6 @@ const fetch = require('node-fetch-v2');
 const portfinder = require('@instana/collector/test/test_util/portfinder');
 const config = require('@instana/core/test/config');
 const AbstractServerlessControl = require('../../serverless/test/util/AbstractServerlessControl');
-const isLatestEsmSupportedVersion = require('@instana/core').util.esm.isLatestEsmSupportedVersion;
 
 const PATH_TO_INSTANA_AZURE_PACKAGE = path.join(__dirname, '..');
 let execArg;
@@ -59,9 +58,7 @@ class Control extends AbstractServerlessControl {
       env.INSTANA_AGENT_KEY = this.instanaAgentKey;
     }
 
-    const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
-      ? ['--import', `${path.join(__dirname, '..', 'esm-register.mjs')}`]
-      : [`--experimental-loader=${path.join(__dirname, '..', 'esm-loader.mjs')}`];
+    const loaderPath = ['--import', `${path.join(__dirname, '..', 'esm-register.mjs')}`];
 
     if (this.opts.containerAppPath && this.opts.env && this.opts.env.ESM_TEST) {
       execArg = this.opts.containerAppPath.endsWith('.mjs') ? loaderPath : ['--require', PATH_TO_INSTANA_AZURE_PACKAGE];
diff --git a/packages/collector/test/test_util/ProcessControls.js b/packages/collector/test/test_util/ProcessControls.js
@@ -20,7 +20,6 @@ const globalAgent = require('../globalAgent');
 const portFinder = require('./portfinder');
 const sslDir = path.join(__dirname, '..', 'apps', 'ssl');
 const cert = fs.readFileSync(path.join(sslDir, 'cert'));
-const isLatestEsmSupportedVersion = require('@instana/core').util.esm.isLatestEsmSupportedVersion;
 
 class ProcessControls {
   /**
@@ -57,10 +56,7 @@ class ProcessControls {
     }
 
     if (process.env.RUN_ESM && !opts.execArgv) {
-      const resolveEsmLoader = () =>
-        isLatestEsmSupportedVersion(process.versions.node)
-          ? [`--import=${path.join(__dirname, '..', '..', 'esm-register.mjs')}`]
-          : [`--experimental-loader=${path.join(__dirname, '..', '..', 'esm-loader.mjs')}`];
+      const esmLoader = [`--import=${path.join(__dirname, '..', '..', 'esm-register.mjs')}`];
 
       try {
         // Custom appPath is provided, use that. here we check the exact file name for esm app
@@ -72,13 +68,13 @@ class ProcessControls {
           const esmApp = testUtils.checkESMApp({ appPath: updatedPath });
 
           if (esmApp) {
-            opts.execArgv = resolveEsmLoader();
+            opts.execArgv = esmLoader;
             opts.appPath = updatedPath;
           }
         } else if (opts?.dirname) {
           const esmApp = testUtils.checkESMApp({ appPath: path.join(opts.dirname, 'app.mjs') });
           if (esmApp) {
-            opts.execArgv = resolveEsmLoader();
+            opts.execArgv = esmLoader;
             opts.appPath = path.join(opts.dirname, 'app.mjs');
           }
         }
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
@@ -9,16 +9,13 @@ const path = require('path');
 const { execSync } = require('child_process');
 const config = require('../../../../../../core/test/config');
 const testUtils = require('../../../../../../core/test/test_util');
-const isLatestEsmSupportedVersion = require('../../../../../../core').util.esm.isLatestEsmSupportedVersion;
 const supportedVersion = require('../../../../../../core').tracing.supportedVersion;
 const ProcessControls = require('../../../../test_util/ProcessControls');
 const globalAgent = require('../../../../globalAgent');
 
 const mochaSuiteFn = supportedVersion(process.versions.node) ? describe : describe.skip;
 
-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')];
+const loaderPath = ['--import', path.join(__dirname, 'node_modules', '@instana', 'collector', 'esm-register.mjs')];
 
 mochaSuiteFn('Typescript TS->ESM', function () {
   this.timeout(config.getTestTimeout() * 5);
diff --git a/packages/collector/test/tracing/sdk/multiple_installations/esm/test.js b/packages/collector/test/tracing/sdk/multiple_installations/esm/test.js
@@ -15,7 +15,6 @@ const config = require('@instana/core/test/config');
 const testUtils = require('@instana/core/test/test_util');
 const ProcessControls = require('../../../../test_util/ProcessControls');
 const globalAgent = require('../../../../globalAgent');
-const isLatestEsmSupportedVersion = require('@instana/core').util.esm.isLatestEsmSupportedVersion;
 const mochaSuiteFn = supportedVersion(process.versions.node) ? describe : describe.skip;
 
 mochaSuiteFn('[ESM] tracing/sdk/multiple_installations', function () {
@@ -40,9 +39,7 @@ mochaSuiteFn('[ESM] tracing/sdk/multiple_installations', function () {
   let controls;
 
   before(async () => {
-    const nodeOptions = isLatestEsmSupportedVersion(process.versions.node)
-      ? '--import ./load-instana.mjs'
-      : '--experimental-loader ./load-instana.mjs';
+    const nodeOptions = '--import ./load-instana.mjs';
     controls = new ProcessControls({
       useGlobalAgent: true,
       cwd: path.join(__dirname, 'src'),
diff --git a/packages/core/src/util/esm.js b/packages/core/src/util/esm.js
@@ -4,31 +4,16 @@
 
 'use strict';
 
-const semver = require('semver');
-
-/**
- * Check if the given Node.js version is the latest version that supports ESM.
- * @param {string} version - The Node.js version to check.
- * @returns {boolean} - True if the version is the latest that supports ESM, false otherwise.
- */
-exports.isLatestEsmSupportedVersion = function isLatestEsmSupportedVersion(version) {
-  // Reference: https://nodejs.org/en/blog/release/v18.19.0#esm-and-customization-hook-changes
-  // Node.js v18.19 and above the loaders are off threaded
-  // https://instana.slack.com/archives/G0118PFNN20/p1708556683665099
-  return semver.gte(version, '18.19.0');
-};
-
 /**
  * Check if the experimental loader flag is enabled and if the current Node.js version supports it.
  * @returns {boolean} - True if the experimental loader is enabled and supported, false otherwise.
  * Node.js v18.19 and above we are not supporting --experimental-loader flag
  */
 exports.hasExperimentalLoaderFlag = function hasExperimentalLoaderFlag() {
-  const experimentalLoaderFlagIsSet =
+  return (
     (process.env.NODE_OPTIONS && process.env.NODE_OPTIONS.includes('--experimental-loader')) ||
-    (process.execArgv[0] && process.execArgv[0].includes('--experimental-loader'));
-
-  return experimentalLoaderFlagIsSet && exports.isLatestEsmSupportedVersion(process.versions.node);
+    (process.execArgv[0] && process.execArgv[0].includes('--experimental-loader'))
+  );
 };
 
 /**
diff --git a/packages/google-cloud-run/test/Control.js b/packages/google-cloud-run/test/Control.js
@@ -12,7 +12,6 @@ const fetch = require('node-fetch-v2');
 const portfinder = require('@instana/collector/test/test_util/portfinder');
 const config = require('@instana/core/test/config');
 const AbstractServerlessControl = require('../../serverless/test/util/AbstractServerlessControl');
-const isLatestEsmSupportedVersion = require('@instana/core').util.esm.isLatestEsmSupportedVersion;
 const PATH_TO_INSTANA_GOOGLE_CLOUD_RUN_PACKAGE = path.join(__dirname, '..');
 
 function Control(opts) {
@@ -90,9 +89,7 @@ Control.prototype.startMonitoredProcess = function startMonitoredProcess() {
     env.INSTANA_AGENT_KEY = this.instanaAgentKey;
   }
 
-  const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
-    ? ['--import', `${path.join(__dirname, '..', 'esm-register.mjs')}`]
-    : [`--experimental-loader=${path.join(__dirname, '..', 'esm-loader.mjs')}`];
+  const loaderPath = ['--import', `${path.join(__dirname, '..', 'esm-register.mjs')}`];
 
   if (!this.opts.containerAppPath && this.opts.env && this.opts.env.ESM_TEST) {
     if (this.opts.containerAppPath.endsWith('.mjs')) {
diff --git a/packages/serverless-collector/test/Control.js b/packages/serverless-collector/test/Control.js
@@ -10,7 +10,6 @@ const fetch = require('node-fetch-v2');
 const portfinder = require('@instana/collector/test/test_util/portfinder');
 const config = require('@instana/core/test/config');
 const AbstractServerlessControl = require('../../serverless/test/util/AbstractServerlessControl');
-const isLatestEsmSupportedVersion = require('@instana/core').util.esm.isLatestEsmSupportedVersion;
 
 const SERVERLESS_COLLECTOR_PATH = path.join(__dirname, '..');
 let execArg;
@@ -60,9 +59,7 @@ class Control extends AbstractServerlessControl {
       env.INSTANA_AGENT_KEY = this.instanaAgentKey;
     }
 
-    const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
-      ? ['--import', `${path.join(__dirname, '..', 'esm-register.mjs')}`]
-      : [`--experimental-loader=${path.join(__dirname, '..', 'esm-loader.mjs')}`];
+    const loaderPath = ['--import', `${path.join(__dirname, '..', 'esm-register.mjs')}`];
 
     if (this.opts.containerAppPath && this.opts.env && this.opts.env.ESM_TEST) {
       execArg = this.opts.containerAppPath.endsWith('.mjs') ? loaderPath : ['--require', SERVERLESS_COLLECTOR_PATH];
diff --git a/packages/shared-metrics/test/esm-loader/test.js b/packages/shared-metrics/test/esm-loader/test.js
@@ -10,12 +10,10 @@ const expect = require('chai').expect;
 const { supportedVersion } = require('@instana/core').tracing;
 const testUtils = require('@instana/core/test/test_util');
 const config = require('@instana/core/test/config');
-const isLatestEsmSupportedVersion = require('@instana/core').util.esm.isLatestEsmSupportedVersion;
 
 const ProcessControls = require('../../../collector/test/test_util/ProcessControls');
-const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
-  ? ['--import', '../../../../collector/esm-register.mjs']
-  : ['--experimental-loader=../../../../collector/esm-loader.mjs'];
+const loaderPath = ['--import', '../../../../collector/esm-register.mjs'];
+
 const mochaSuiteFn = supportedVersion(process.versions.node) ? describe : describe.skip;
 
 mochaSuiteFn('ESM loader', function () {
@@ -121,9 +119,8 @@ mochaSuiteFn('ESM loader', function () {
   describe('case 4 (NODE_OPTIONS)', function () {
     this.timeout(config.getTestTimeout());
     let controls;
-    const nodeOption = isLatestEsmSupportedVersion(process.versions.node)
-      ? '--import ../../../../collector/esm-register.mjs'
-      : '--experimental-loader=../../../../collector/esm-loader.mjs';
+    const nodeOption = '--import ../../../../collector/esm-register.mjs';
+
     before(async () => {
       controls = new ProcessControls({
         env: {
