From 99950511a4977b1bac5f6890da9f2089251053f3 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Wed, 24 Jan 2024 18:58:27 +0100 Subject: [PATCH 1/6] fix(instrumentation): pin import-in-the-middle@1.7.1 --- .../package.json | 2 +- package-lock.json | 48 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 3724bf7ca3..c94165c1fe 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -72,7 +72,7 @@ }, "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "^1.7.2", + "import-in-the-middle": "1.7.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" diff --git a/package-lock.json b/package-lock.json index 2524eca71e..237f56e95f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3108,7 +3108,7 @@ "license": "Apache-2.0", "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "^1.7.2", + "import-in-the-middle": "1.7.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" @@ -3948,6 +3948,17 @@ "node": ">=10.13.0" } }, + "experimental/packages/opentelemetry-instrumentation/node_modules/import-in-the-middle": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", + "integrity": "sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==", + "dependencies": { + "acorn": "^8.8.2", + "acorn-import-assertions": "^1.9.0", + "cjs-module-lexer": "^1.2.2", + "module-details-from-path": "^1.0.3" + } + }, "experimental/packages/opentelemetry-instrumentation/node_modules/interpret": { "version": "3.1.1", "dev": true, @@ -19486,17 +19497,6 @@ "node": ">=4" } }, - "node_modules/import-in-the-middle": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.2.tgz", - "integrity": "sha512-coz7AjRnPyKW36J6JX5Bjz1mcX7MX1H2XsEGseVcnXMdzsAbbAu0HBZhiAem+3SAmuZdi+p8OwoB2qUpTRgjOQ==", - "dependencies": { - "acorn": "^8.8.2", - "acorn-import-assertions": "^1.9.0", - "cjs-module-lexer": "^1.2.2", - "module-details-from-path": "^1.0.3" - } - }, "node_modules/import-local": { "version": "3.1.0", "dev": true, @@ -40348,7 +40348,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "import-in-the-middle": "^1.7.2", + "import-in-the-middle": "1.7.1", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -40406,6 +40406,17 @@ "tapable": "^2.2.0" } }, + "import-in-the-middle": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", + "integrity": "sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==", + "requires": { + "acorn": "^8.8.2", + "acorn-import-assertions": "^1.9.0", + "cjs-module-lexer": "^1.2.2", + "module-details-from-path": "^1.0.3" + } + }, "interpret": { "version": "3.1.1", "dev": true @@ -49648,17 +49659,6 @@ } } }, - "import-in-the-middle": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.2.tgz", - "integrity": "sha512-coz7AjRnPyKW36J6JX5Bjz1mcX7MX1H2XsEGseVcnXMdzsAbbAu0HBZhiAem+3SAmuZdi+p8OwoB2qUpTRgjOQ==", - "requires": { - "acorn": "^8.8.2", - "acorn-import-assertions": "^1.9.0", - "cjs-module-lexer": "^1.2.2", - "module-details-from-path": "^1.0.3" - } - }, "import-local": { "version": "3.1.0", "dev": true, From 4f6625972a63de053a4adbeec5725b9b65f56f74 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Wed, 24 Jan 2024 19:18:15 +0100 Subject: [PATCH 2/6] fix(changelog): add changlog entry --- experimental/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 21e254222e..d1f72101fc 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -6,6 +6,10 @@ All notable changes to experimental packages in this project will be documented ### :boom: Breaking Change + * fix(instrumentation)!: pin import-in-the-middle@1.7.1 [#4441](https://github.com/open-telemetry/opentelemetry-js/pull/4441) + * Only affects users that are using the experimental `@opentelemetry/instrumentation/hook.mjs` loder hook AND Node.js 18.19 or later: + * This reverts back to an older version of import-in-the-middle due to https://github.com/DataDog/import-in-the-middle/issues/57 + ### :rocket: (Enhancement) ### :bug: (Bug Fix) From ccb99834df1c9cd7e1f08a91a69b06de14b02974 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 25 Jan 2024 07:38:09 +0100 Subject: [PATCH 3/6] Update experimental/CHANGELOG.md Co-authored-by: Trent Mick --- experimental/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index d1f72101fc..f52c4f5051 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -6,9 +6,9 @@ All notable changes to experimental packages in this project will be documented ### :boom: Breaking Change - * fix(instrumentation)!: pin import-in-the-middle@1.7.1 [#4441](https://github.com/open-telemetry/opentelemetry-js/pull/4441) +* fix(instrumentation)!: pin import-in-the-middle@1.7.1 [#4441](https://github.com/open-telemetry/opentelemetry-js/pull/4441) * Only affects users that are using the experimental `@opentelemetry/instrumentation/hook.mjs` loder hook AND Node.js 18.19 or later: - * This reverts back to an older version of import-in-the-middle due to https://github.com/DataDog/import-in-the-middle/issues/57 + * This reverts back to an older version of import-in-the-middle due to ### :rocket: (Enhancement) From 7517a8713b03eea131c6f688810a128a85a2cb9c Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 25 Jan 2024 08:00:04 +0100 Subject: [PATCH 4/6] fix(changelog): additional details --- experimental/CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index f52c4f5051..0e65c51bf7 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -6,9 +6,11 @@ All notable changes to experimental packages in this project will be documented ### :boom: Breaking Change -* fix(instrumentation)!: pin import-in-the-middle@1.7.1 [#4441](https://github.com/open-telemetry/opentelemetry-js/pull/4441) - * Only affects users that are using the experimental `@opentelemetry/instrumentation/hook.mjs` loder hook AND Node.js 18.19 or later: - * This reverts back to an older version of import-in-the-middle due to + * fix(instrumentation)!: pin import-in-the-middle@1.7.1 [#4441](https://github.com/open-telemetry/opentelemetry-js/pull/4441) + * Fixes a bug where, in some circumstances, ESM instrumentation packages would try to instrument CJS exports on ESM, causing the end-user application to crash. + * This breaking change only affects users that are using the *experimental* `@opentelemetry/instrumentation/hook.mjs` loader hook AND Node.js 18.19 or later: + * This reverts back to an older version of `import-in-the-middle` due to https://github.com/DataDog/import-in-the-middle/issues/57 + * This version does not support Node.js 18.19 or later. ### :rocket: (Enhancement) From 520b6b207c22e7f7fb33a55ee15cd91f94b0165e Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 25 Jan 2024 08:01:42 +0100 Subject: [PATCH 5/6] fix(changelog): formatting --- experimental/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 0e65c51bf7..98d88eae3d 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -6,11 +6,11 @@ All notable changes to experimental packages in this project will be documented ### :boom: Breaking Change - * fix(instrumentation)!: pin import-in-the-middle@1.7.1 [#4441](https://github.com/open-telemetry/opentelemetry-js/pull/4441) +* fix(instrumentation)!: pin import-in-the-middle@1.7.1 [#4441](https://github.com/open-telemetry/opentelemetry-js/pull/4441) * Fixes a bug where, in some circumstances, ESM instrumentation packages would try to instrument CJS exports on ESM, causing the end-user application to crash. * This breaking change only affects users that are using the *experimental* `@opentelemetry/instrumentation/hook.mjs` loader hook AND Node.js 18.19 or later: * This reverts back to an older version of `import-in-the-middle` due to https://github.com/DataDog/import-in-the-middle/issues/57 - * This version does not support Node.js 18.19 or later. + * This version does not support Node.js 18.19 or later ### :rocket: (Enhancement) From bd98d8370b7768486ba1e7e3d5377fb3deab4ce2 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 25 Jan 2024 08:04:21 +0100 Subject: [PATCH 6/6] fix(changelog): lint --- experimental/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 98d88eae3d..2501ed37ea 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to experimental packages in this project will be documented * fix(instrumentation)!: pin import-in-the-middle@1.7.1 [#4441](https://github.com/open-telemetry/opentelemetry-js/pull/4441) * Fixes a bug where, in some circumstances, ESM instrumentation packages would try to instrument CJS exports on ESM, causing the end-user application to crash. * This breaking change only affects users that are using the *experimental* `@opentelemetry/instrumentation/hook.mjs` loader hook AND Node.js 18.19 or later: - * This reverts back to an older version of `import-in-the-middle` due to https://github.com/DataDog/import-in-the-middle/issues/57 + * This reverts back to an older version of `import-in-the-middle` due to * This version does not support Node.js 18.19 or later ### :rocket: (Enhancement)