Skip to content

Commit 1b882ce

Browse files
committed
fix: added register
1 parent 34b40f8 commit 1b882ce

File tree

12 files changed

+53
-12
lines changed

12 files changed

+53
-12
lines changed

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,10 @@ REGIONS=<region> SKIP_DOCKER_IMAGE=true BUILD_LAYER_WITH=local LAYER_NAME=experi
324324

325325
Use the following command to enable experimental ESM support:
326326

327-
Node.js >= v18.19
327+
- For Node.js versions greater than or equal to 18.19:
328328

329-
`node --import ../esm-loader.mjs entry-point`
329+
node --import ../register.mjs entry-point
330330

331-
For Node.js versions ≥14.0 and <18.19
331+
- For Node.js versions less than 18.19:
332332

333-
`node --experimental-loader ../esm-loader.mjs entry-point`
333+
node --experimental-loader ../esm-loader.mjs entry-point

packages/aws-fargate/register.mjs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*
2+
* (c) Copyright IBM Corp. 2024
3+
*/
4+
5+
import { register } from 'node:module';
6+
7+
register(import.meta.url);
8+
import './src/index.js';

packages/aws-fargate/test/Control.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Control.prototype.startMonitoredProcess = function startMonitoredProcess() {
8787
}
8888

8989
const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
90-
? ['--import', `${path.join(__dirname, '..', 'esm-loader.mjs')}`]
90+
? ['--import', `${path.join(__dirname, '..', 'register.mjs')}`]
9191
: [`--experimental-loader=${path.join(__dirname, '..', 'esm-loader.mjs')}`];
9292

9393
if (this.opts.containerAppPath && this.opts.env && this.opts.env.ESM_TEST) {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*
2+
* (c) Copyright IBM Corp. 2024
3+
*/
4+
5+
import { register } from 'node:module';
6+
7+
register(import.meta.url);
8+
import './src/index.js';

packages/azure-container-services/test/Control.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Control extends AbstractServerlessControl {
5252
}
5353

5454
const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
55-
? ['--import', `${path.join(__dirname, '..', 'esm-loader.mjs')}`]
55+
? ['--import', `${path.join(__dirname, '..', 'register.mjs')}`]
5656
: [`--experimental-loader=${path.join(__dirname, '..', 'esm-loader.mjs')}`];
5757

5858
if (this.opts.containerAppPath && this.opts.env && this.opts.env.ESM_TEST) {

packages/collector/register.mjs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*
2+
* (c) Copyright IBM Corp. 2024
3+
*/
4+
5+
import { register } from 'node:module';
6+
7+
register(import.meta.url);
8+
import './src/index.js';

packages/collector/test/test_util/ProcessControls.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class ProcessControls {
6262

6363
if (esmApp) {
6464
opts.execArgv = isLatestEsmSupportedVersion(process.versions.node)
65-
? ['--import', `${path.join(__dirname, '..', '..', 'esm-loader.mjs')}`]
65+
? ['--import', `${path.join(__dirname, '..', '..', 'register.mjs')}`]
6666
: [`--experimental-loader=${path.join(__dirname, '..', '..', 'esm-loader.mjs')}`];
6767
opts.appPath = path.join(opts.dirname, 'app.mjs');
6868
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* (c) Copyright IBM Corp. 2024
3+
*/
4+
5+
import { register } from 'node:module';
6+
7+
register(import.meta.url);
8+
const instana = await import(process.env.INSTANA_COLLECTOR_PATH);
9+
instana.default();

packages/core/src/util/applicationUnderMonitoring.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ function getMainPackageJsonPathStartingAtDirectory(startDirectory, cb) {
167167
// @ts-ignore
168168
(process._preload_modules && process._preload_modules.length > 0) ||
169169
(process.env.NODE_OPTIONS &&
170-
(process.env.NODE_OPTIONS.indexOf('--experimental-loader') !== -1 ||
170+
(process.env.NODE_OPTIONS.indexOf('--register') !== -1 ||
171171
process.env.NODE_OPTIONS.indexOf('--import') !== -1)) ||
172172
(process.execArgv &&
173173
process.execArgv.length > 0 &&
174174
((process.execArgv[0].indexOf('--experimental-loader') !== -1 &&
175175
process.execArgv[0].indexOf('esm-loader.mjs')) !== -1 ||
176176
(process.execArgv[0].indexOf('--experimental-loader') !== -1 &&
177177
process.execArgv[1].indexOf('esm-loader.mjs') !== -1))) ||
178-
(process.execArgv[0].indexOf('--import') !== -1 && process.execArgv[0].indexOf('esm-loader.mjs') !== -1)
178+
(process.execArgv[0].indexOf('--import') !== -1 && process.execArgv[0].indexOf('register.mjs') !== -1)
179179
) {
180180
// @ts-ignore
181181
mainModule = {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*
2+
* (c) Copyright IBM Corp. 2024
3+
*/
4+
5+
import { register } from 'node:module';
6+
7+
register(import.meta.url);
8+
import './src/index.js';

packages/google-cloud-run/test/Control.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Control.prototype.startMonitoredProcess = function startMonitoredProcess() {
8383
}
8484

8585
const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
86-
? ['--import', `${path.join(__dirname, '..', 'esm-loader.mjs')}`]
86+
? ['--import', `${path.join(__dirname, '..', 'register.mjs')}`]
8787
: [`--experimental-loader=${path.join(__dirname, '..', 'esm-loader.mjs')}`];
8888

8989
if (!this.opts.containerAppPath && this.opts.env && this.opts.env.ESM_TEST) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const isLatestEsmSupportedVersion = require('@instana/core').tracing.isLatestEsm
1414

1515
const ProcessControls = require('../../../collector/test/test_util/ProcessControls');
1616
const loaderPath = isLatestEsmSupportedVersion(process.versions.node)
17-
? ['--import', '../../../../collector/esm-loader.mjs']
17+
? ['--import', '../../../../collector/register.mjs']
1818
: ['--experimental-loader=../../../../collector/esm-loader.mjs'];
1919
const mochaSuiteFn = supportedVersion(process.versions.node) ? describe : describe.skip;
2020

@@ -122,7 +122,7 @@ mochaSuiteFn('ESM loader', function () {
122122
this.timeout(config.getTestTimeout());
123123
let controls;
124124
const nodeOption = isLatestEsmSupportedVersion(process.versions.node)
125-
? '--import ../../../../collector/esm-loader.mjs'
125+
? '--import ../../../../collector/register.mjs'
126126
: '--experimental-loader=../../../../collector/esm-loader.mjs';
127127
before(async () => {
128128
controls = new ProcessControls({

0 commit comments

Comments
 (0)