From d75009141672ee0d8dbb4b16fc10a26b3d515d1b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 27 Nov 2024 18:48:01 +0000 Subject: [PATCH 1/3] chore(deps): update dependency zone.js to ^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0 --- .../auto-instrumentations-web/package.json | 2 +- package-lock.json | 36 +++++++++---------- .../package.json | 2 +- .../package.json | 4 +-- 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 3d235664ce..c114540a50 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -31,7 +31,7 @@ }, "peerDependencies": { "@opentelemetry/api": "^1.3.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "devDependencies": { "@babel/core": "7.24.6", diff --git a/package-lock.json b/package-lock.json index 03be175022..674bfc85f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -500,7 +500,7 @@ }, "peerDependencies": { "@opentelemetry/api": "^1.3.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" } }, "metapackages/auto-instrumentations-web/node_modules/@babel/core": { @@ -33461,7 +33461,8 @@ "node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "dev": true }, "node_modules/tsscmp": { "version": "1.0.6", @@ -35243,12 +35244,9 @@ } }, "node_modules/zone.js": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.4.tgz", - "integrity": "sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw==", - "dependencies": { - "tslib": "^2.0.0" - } + "version": "0.14.10", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz", + "integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==" }, "packages/baggage-span-processor": { "name": "@opentelemetry/baggage-span-processor", @@ -38346,7 +38344,7 @@ "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "engines": { "node": ">=14" @@ -38525,14 +38523,14 @@ "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "engines": { "node": ">=14" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" } }, "plugins/web/opentelemetry-instrumentation-user-interaction/node_modules/@babel/core": { @@ -48139,7 +48137,7 @@ "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "dependencies": { "@babel/core": { @@ -49610,7 +49608,7 @@ "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "dependencies": { "@babel/core": { @@ -68509,7 +68507,8 @@ "tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "dev": true }, "tsscmp": { "version": "1.0.6", @@ -69844,12 +69843,9 @@ } }, "zone.js": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.4.tgz", - "integrity": "sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw==", - "requires": { - "tslib": "^2.0.0" - } + "version": "0.14.10", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz", + "integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==" } } } diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index b7a4a9d90e..9811871151 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -74,7 +74,7 @@ "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "dependencies": { "@opentelemetry/core": "^1.8.0", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index b091211abd..53926ab51d 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -76,7 +76,7 @@ "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-merge": "5.10.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "dependencies": { "@opentelemetry/core": "^1.8.0", @@ -85,7 +85,7 @@ }, "peerDependencies": { "@opentelemetry/api": "^1.3.0", - "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0" + "zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0" }, "sideEffects": false, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/web/opentelemetry-instrumentation-user-interaction#readme" From 8f849bdddbf9c7c706472cb5b2781f5921161eb2 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Sun, 1 Dec 2024 19:34:57 +0100 Subject: [PATCH 2/3] fix(instrumentation-user-interaction): reference zone.js types --- .../src/internal-types.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts b/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts index a845906632..a90007f239 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +/// import { HrTime } from '@opentelemetry/api'; import { EventName } from './types'; From b3dda26481833bbf2817ef10351a06bcd3837e0f Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 5 Dec 2024 13:37:33 +0100 Subject: [PATCH 3/3] fix(instrumentation-user-insteraction)!: make getZoneWithPrototype private --- .../src/instrumentation.ts | 6 +++--- .../test/userInteraction.nozone.test.ts | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts b/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts index c1b7ff4cad..6216be899a 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts @@ -575,7 +575,7 @@ export class UserInteractionInstrumentation extends InstrumentationBase { }); sandbox - .stub(userInteractionInstrumentation, 'getZoneWithPrototype') + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore this is private, but it exists + .stub(userInteractionInstrumentation, '_getZoneWithPrototype') .callsFake(() => { return false as any; });