From 2d09220d21c4efd60f6f33bdaabc172c1c86c5e1 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Sat, 1 Jun 2024 14:03:23 +0200 Subject: [PATCH 1/4] fix: Update `import-in-the-middle` --- .../opentelemetry-instrumentation/package.json | 2 +- .../src/platform/node/instrumentation.ts | 2 +- package-lock.json | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index c462fd1c79..9ff1d1c7c2 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -74,7 +74,7 @@ "dependencies": { "@opentelemetry/api-logs": "0.51.1", "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.7.4", + "import-in-the-middle": "1.8.0", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts index 6c2aa08281..4c59991120 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts @@ -310,7 +310,7 @@ export abstract class InstrumentationBase< this._hooks.push(hook); const esmHook = - new (ImportInTheMiddle as unknown as typeof ImportInTheMiddle.default)( + new ((ImportInTheMiddle as unknown as { Hook: typeof ImportInTheMiddle.default }).Hook)( [module.name], { internals: false }, hookFn diff --git a/package-lock.json b/package-lock.json index 392ef98799..821bb52df2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2202,7 +2202,7 @@ "dependencies": { "@opentelemetry/api-logs": "0.51.1", "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.7.4", + "import-in-the-middle": "1.8.0", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" @@ -17855,9 +17855,9 @@ } }, "node_modules/import-in-the-middle": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.4.tgz", - "integrity": "sha512-Lk+qzWmiQuRPPulGQeK5qq0v32k2bHnWrRPFgqyvhw7Kkov5L6MOLOIU3pcWeujc9W4q54Cp3Q2WV16eQkc7Bg==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.8.0.tgz", + "integrity": "sha512-/xQjze8szLNnJ5rvHSzn+dcVXqCAU6Plbk4P24U/jwPmg1wy7IIp9OjKIO5tYue8GSPhDpPDiApQjvBUmWwhsQ==", "dependencies": { "acorn": "^8.8.2", "acorn-import-attributes": "^1.9.5", @@ -37304,7 +37304,7 @@ "codecov": "3.8.3", "cpx2": "2.0.0", "cross-var": "1.1.0", - "import-in-the-middle": "1.7.4", + "import-in-the-middle": "1.8.0", "karma": "6.4.3", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -47339,9 +47339,9 @@ } }, "import-in-the-middle": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.4.tgz", - "integrity": "sha512-Lk+qzWmiQuRPPulGQeK5qq0v32k2bHnWrRPFgqyvhw7Kkov5L6MOLOIU3pcWeujc9W4q54Cp3Q2WV16eQkc7Bg==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.8.0.tgz", + "integrity": "sha512-/xQjze8szLNnJ5rvHSzn+dcVXqCAU6Plbk4P24U/jwPmg1wy7IIp9OjKIO5tYue8GSPhDpPDiApQjvBUmWwhsQ==", "requires": { "acorn": "^8.8.2", "acorn-import-attributes": "^1.9.5", From 22ecefd476fd287fdb8cecde40ef64076e6d943f Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Sat, 1 Jun 2024 14:15:16 +0200 Subject: [PATCH 2/4] changelog and lint --- experimental/CHANGELOG.md | 1 + .../src/platform/node/instrumentation.ts | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 65d1819485..c898793a8f 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -30,6 +30,7 @@ All notable changes to experimental packages in this project will be documented * feat(propagator-aws-xray-lambda): add AWS Xray Lambda propagator [4554](https://github.com/open-telemetry/opentelemetry-js/pull/4554) ### :bug: (Bug Fix) +* fix(instrumentation): Update `import-in-the-middle` to fix numerous bugs [#4745] ### :books: (Refine Doc) diff --git a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts index 4c59991120..a60e74b47a 100644 --- a/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts +++ b/experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts @@ -309,12 +309,11 @@ export abstract class InstrumentationBase< : this._requireInTheMiddleSingleton.register(module.name, onRequire); this._hooks.push(hook); - const esmHook = - new ((ImportInTheMiddle as unknown as { Hook: typeof ImportInTheMiddle.default }).Hook)( - [module.name], - { internals: false }, - hookFn - ); + const esmHook = new ( + ImportInTheMiddle as unknown as { + Hook: typeof ImportInTheMiddle.default; + } + ).Hook([module.name], { internals: false }, hookFn); this._hooks.push(esmHook); } } From f48d13d3cf070d457890105cdce438630bb0f268 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Sat, 1 Jun 2024 14:25:04 +0200 Subject: [PATCH 3/4] lint --- experimental/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index c898793a8f..e2ae45b84b 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -30,6 +30,7 @@ All notable changes to experimental packages in this project will be documented * feat(propagator-aws-xray-lambda): add AWS Xray Lambda propagator [4554](https://github.com/open-telemetry/opentelemetry-js/pull/4554) ### :bug: (Bug Fix) + * fix(instrumentation): Update `import-in-the-middle` to fix numerous bugs [#4745] ### :books: (Refine Doc) From 913f9fba60b235ba76f508ae96042540a7b32f37 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Tue, 4 Jun 2024 17:28:24 +0200 Subject: [PATCH 4/4] changes from code review Co-authored-by: Marc Pichler --- experimental/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index e2ae45b84b..758e1e72e6 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -31,7 +31,7 @@ All notable changes to experimental packages in this project will be documented ### :bug: (Bug Fix) -* fix(instrumentation): Update `import-in-the-middle` to fix numerous bugs [#4745] +* fix(instrumentation): Update `import-in-the-middle` to fix [numerous bugs](https://github.com/DataDog/import-in-the-middle/pull/91) [#4745](https://github.com/open-telemetry/opentelemetry-js/pull/4745) @timfish ### :books: (Refine Doc)