[Fixes # 4533] Replaced cpx2 with local test module (#5077)

Co-authored-by: Marc Pichler <[email protected]> Co-authored-by: Raphaël Thériault <[email protected]> Co-authored-by: Jakub Ziółkowski <[email protected]> Co-authored-by: David Luna <[email protected]> Co-authored-by: Trent Mick <[email protected]> Co-authored-by: Marylia Gutierrez <[email protected]> Co-authored-by: Mend Renovate <[email protected]> Co-authored-by: Mercy Bassey <[email protected]> Co-authored-by: OpenTelemetry Bot <[email protected]>
open-telemetry · Nov 4, 2024 · 2b73d37 · 2b73d37
1 parent eb3ca4f
commit 2b73d37
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 15 deletions.
diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json
@@ -93,7 +93,7 @@
     "babel-loader": "8.4.1",
     "babel-plugin-istanbul": "7.0.0",
     "codecov": "3.8.3",
-    "cpx2": "2.0.0",
+
     "cross-var": "1.1.0",
     "karma": "6.4.4",
     "karma-chrome-launcher": "3.1.0",

diff --git a/...ntal/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts b/...ntal/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts
@@ -39,8 +39,8 @@ describe('RequireInTheMiddleSingleton', () => {
     const onRequireFsPromisesStub = makeOnRequiresStub('fs-promises');
     const onRequireCodecovStub = makeOnRequiresStub('codecov');
     const onRequireCodecovLibStub = makeOnRequiresStub('codecov-lib');
-    const onRequireCpxStub = makeOnRequiresStub('cpx2');
-    const onRequireCpxLibStub = makeOnRequiresStub('cpx2-lib');
+    const onRequireCpxStub = makeOnRequiresStub('test-non-core-module');
+    const onRequireCpxLibStub = makeOnRequiresStub('test-non-core-module-lib');
 
     before(() => {
       requireInTheMiddleSingleton.register('fs', onRequireFsStub);
@@ -53,9 +53,12 @@ describe('RequireInTheMiddleSingleton', () => {
         'codecov/lib/codecov.js',
         onRequireCodecovLibStub
       );
-      requireInTheMiddleSingleton.register('cpx2', onRequireCpxStub);
       requireInTheMiddleSingleton.register(
-        'cpx2/lib/copy-sync.js',
+        'test-non-core-module',
+        onRequireCpxStub
+      );
+      requireInTheMiddleSingleton.register(
+        'test-non-core-module/lib/copy-sync.js',
         onRequireCpxLibStub
       );
     });
@@ -120,8 +123,12 @@ describe('RequireInTheMiddleSingleton', () => {
 
     describe('non-core module', () => {
       describe('AND module name matches', () => {
-        const baseDir = path.dirname(require.resolve('codecov'));
-        const modulePath = path.join('codecov', 'lib', 'codecov.js');
+        const baseDir = path.normalize(
+          path.dirname(require.resolve('codecov'))
+        );
+        const modulePath = path.normalize(
+          path.join('codecov', 'lib', 'codecov.js')
+        );
         it('should call `onRequire`', () => {
           const exports = require('codecov');
           assert.deepStrictEqual(exports.__ritmOnRequires, ['codecov']);
@@ -149,20 +156,29 @@ describe('RequireInTheMiddleSingleton', () => {
 
     describe('non-core module with sub-path', () => {
       describe('AND module name matches', () => {
-        const baseDir = path.resolve(
-          path.dirname(require.resolve('cpx2')),
-          '..'
+        const baseDir = path.normalize(
+          path.resolve(
+            path.dirname(require.resolve('test-non-core-module')),
+            '..'
+          )
+        );
+        const modulePath = path.normalize(
+          path.join('test-non-core-module', 'lib', 'copy-sync.js')
         );
-        const modulePath = path.join('cpx2', 'lib', 'copy-sync.js');
         it('should call `onRequire`', () => {
-          const exports = require('cpx2/lib/copy-sync');
+          const exports = require('test-non-core-module/lib/copy-sync');
           assert.deepStrictEqual(exports.__ritmOnRequires, [
-            'cpx2',
-            'cpx2-lib',
+            'test-non-core-module',
+            'test-non-core-module-lib',
           ]);
           sinon.assert.calledWithMatch(
             onRequireCpxStub,
-            { __ritmOnRequires: ['cpx2', 'cpx2-lib'] },
+            {
+              __ritmOnRequires: [
+                'test-non-core-module',
+                'test-non-core-module-lib',
+              ],
+            },
             modulePath,
             baseDir
           );

diff --git a/...pentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/copy-sync.js b/...pentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/copy-sync.js
diff --git a/...es/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/index.js b/...es/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/lib/index.js
diff --git a/...es/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/package.json b/...es/opentelemetry-instrumentation/test/node/node_modules/test-non-core-module/package.json