From 892f8b9862d4bd2fb304239d792bfe1706edfc6f Mon Sep 17 00:00:00 2001 From: Chengzhong Wu Date: Wed, 17 Jan 2024 11:53:51 +0800 Subject: [PATCH] test: transpile zone.js products in test --- examples/opentelemetry-web/package.json | 3 +- .../exporter-logs-otlp-grpc/package.json | 1 + .../exporter-logs-otlp-http/package.json | 1 + .../exporter-logs-otlp-proto/package.json | 1 + .../exporter-trace-otlp-grpc/package.json | 1 + .../exporter-trace-otlp-http/package.json | 1 + .../exporter-trace-otlp-proto/package.json | 1 + .../package.json | 1 + .../package.json | 1 + .../package.json | 1 + .../package.json | 1 + .../package.json | 1 + .../package.json | 1 + .../package.json | 1 + .../packages/otlp-exporter-base/package.json | 1 + .../otlp-grpc-exporter-base/package.json | 1 + .../otlp-proto-exporter-base/package.json | 1 + experimental/packages/sdk-logs/package.json | 1 + karma.webpack.js | 16 ++++++ package-lock.json | 51 ++++++++++++++++++- .../package.json | 1 + .../test/ZoneContextManager.test.ts | 2 +- .../opentelemetry-context-zone/package.json | 1 + .../package.json | 1 + .../opentelemetry-sdk-trace-web/package.json | 1 + packages/sdk-metrics/package.json | 1 + 26 files changed, 90 insertions(+), 4 deletions(-) diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json index 78c1298f0e1..b39e0234fbc 100644 --- a/examples/opentelemetry-web/package.json +++ b/examples/opentelemetry-web/package.json @@ -32,7 +32,8 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "devDependencies": { - "@babel/core": "^7.6.0", + "@babel/core": "^7.23.6", + "@babel/preset-env": "^7.22.20", "babel-loader": "^8.0.6", "ts-loader": "^9.2.6", "typescript": "^4.5.2", diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json index 1a08243ee18..a320ba04da4 100644 --- a/experimental/packages/exporter-logs-otlp-grpc/package.json +++ b/experimental/packages/exporter-logs-otlp-grpc/package.json @@ -49,6 +49,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", "@opentelemetry/api-logs": "0.47.0", diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json index 508834942c0..6b7fac5a179 100644 --- a/experimental/packages/exporter-logs-otlp-http/package.json +++ b/experimental/packages/exporter-logs-otlp-http/package.json @@ -72,6 +72,7 @@ "sideEffects": false, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/resources": "1.20.0", "@types/mocha": "10.0.6", diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json index b054acc8125..df3b011b282 100644 --- a/experimental/packages/exporter-logs-otlp-proto/package.json +++ b/experimental/packages/exporter-logs-otlp-proto/package.json @@ -64,6 +64,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index c64bc5f2044..4f8eb328067 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -48,6 +48,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", "@opentelemetry/otlp-exporter-base": "0.47.0", diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 92037029cd2..b43919e766e 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -64,6 +64,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index edc20e95afa..c6767bd1da4 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -63,6 +63,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json index 7a49fb111c8..69cdcb64f3f 100644 --- a/experimental/packages/opentelemetry-browser-detector/package.json +++ b/experimental/packages/opentelemetry-browser-detector/package.json @@ -54,6 +54,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index 0f2b35612b2..e738e8ba044 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -48,6 +48,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 0713b2094eb..149dcf8b2e1 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -64,6 +64,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index 7d406b4c44f..efedd5ce164 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -56,6 +56,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 4c5a2f2820a..3b0c30ba0f8 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -55,6 +55,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/propagator-b3": "1.20.0", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 564d68fcdf4..1669d2cf125 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -55,6 +55,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/propagator-b3": "1.20.0", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index c8ed2ad0708..3724bf7ca3d 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -82,6 +82,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/sdk-metrics": "1.20.0", "@types/mocha": "10.0.6", diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 11b93d2f6d4..b94812dfa5d 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -65,6 +65,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json index 55f11193a7f..c260faa1541 100644 --- a/experimental/packages/otlp-grpc-exporter-base/package.json +++ b/experimental/packages/otlp-grpc-exporter-base/package.json @@ -49,6 +49,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/otlp-transformer": "0.47.0", "@opentelemetry/resources": "1.20.0", diff --git a/experimental/packages/otlp-proto-exporter-base/package.json b/experimental/packages/otlp-proto-exporter-base/package.json index 3af11a6fe9f..a25adb831af 100644 --- a/experimental/packages/otlp-proto-exporter-base/package.json +++ b/experimental/packages/otlp-proto-exporter-base/package.json @@ -60,6 +60,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json index acbc3f7493c..2281af05226 100644 --- a/experimental/packages/sdk-logs/package.json +++ b/experimental/packages/sdk-logs/package.json @@ -73,6 +73,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.4.0 <1.8.0", "@opentelemetry/api-logs": "0.47.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", diff --git a/karma.webpack.js b/karma.webpack.js index b7fa7acb978..d15c15384aa 100644 --- a/karma.webpack.js +++ b/karma.webpack.js @@ -26,6 +26,22 @@ module.exports = { module: { rules: [ { test: /\.ts$/, use: 'ts-loader' }, + { + test: /\.js$/, + exclude: { + and: [/node_modules/], // Exclude libraries in node_modules ... + not: [ + // Except for a few of them that needs to be transpiled because they use modern syntax + /zone.js/, + ], + }, + use: { + loader: 'babel-loader', + options: { + presets: ['@babel/preset-env'], + } + }, + }, { enforce: 'post', exclude: /(node_modules|\.test\.[tj]sx?$)/, diff --git a/package-lock.json b/package-lock.json index 2f9b117d0d2..8999dc485bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "hasInstallScript": true, "license": "Apache-2.0", "workspaces": [ + "api", "packages/*", "experimental/packages/*", "experimental/examples/*", @@ -276,7 +277,8 @@ "@opentelemetry/semantic-conventions": "1.20.0" }, "devDependencies": { - "@babel/core": "^7.6.0", + "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "babel-loader": "^8.0.6", "ts-loader": "^9.2.6", "typescript": "^4.5.2", @@ -1061,6 +1063,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", "@opentelemetry/api-logs": "0.47.0", @@ -1100,6 +1103,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/resources": "1.20.0", "@types/mocha": "10.0.6", @@ -1416,6 +1420,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -1727,6 +1732,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", "@opentelemetry/otlp-exporter-base": "0.47.0", @@ -1764,6 +1770,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -2077,6 +2084,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -2384,6 +2392,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -2695,6 +2704,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", @@ -2731,6 +2741,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -3045,6 +3056,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -3111,6 +3123,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/sdk-metrics": "1.20.0", "@types/mocha": "10.0.6", @@ -3159,6 +3172,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/propagator-b3": "1.20.0", @@ -3566,6 +3580,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/propagator-b3": "1.20.0", @@ -4186,6 +4201,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -4494,6 +4510,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/otlp-transformer": "0.47.0", "@opentelemetry/resources": "1.20.0", @@ -4531,6 +4548,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -4710,6 +4728,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.4.0 <1.8.0", "@opentelemetry/api-logs": "0.47.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", @@ -32971,6 +32990,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -33004,6 +33024,7 @@ "license": "Apache-2.0", "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -33768,6 +33789,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -34779,6 +34801,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/propagator-b3": "1.20.0", @@ -35147,6 +35170,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.3.0 <1.8.0", "@types/lodash.merge": "4.6.9", "@types/mocha": "10.0.6", @@ -39142,6 +39166,7 @@ "version": "file:packages/opentelemetry-context-zone", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/context-zone-peer-dep": "1.20.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -39307,6 +39332,7 @@ "version": "file:packages/opentelemetry-context-zone-peer-dep", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", @@ -39593,6 +39619,7 @@ "version": "file:experimental/packages/exporter-logs-otlp-grpc", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", @@ -39622,6 +39649,7 @@ "version": "file:experimental/packages/exporter-logs-otlp-http", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/api-logs": "0.47.0", "@opentelemetry/core": "1.20.0", @@ -39795,6 +39823,7 @@ "version": "file:experimental/packages/exporter-logs-otlp-proto", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/api-logs": "0.47.0", "@opentelemetry/core": "1.20.0", @@ -39968,6 +39997,7 @@ "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", @@ -39996,6 +40026,7 @@ "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-http", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.20.0", "@opentelemetry/otlp-exporter-base": "0.47.0", @@ -40168,6 +40199,7 @@ "version": "file:experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.20.0", "@opentelemetry/exporter-metrics-otlp-http": "0.47.0", @@ -40216,6 +40248,7 @@ "version": "file:experimental/packages/exporter-trace-otlp-grpc", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/grpc-js": "^1.7.1", "@grpc/proto-loader": "^0.7.10", "@opentelemetry/api": "1.7.0", @@ -40244,6 +40277,7 @@ "version": "file:experimental/packages/exporter-trace-otlp-http", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.20.0", "@opentelemetry/otlp-exporter-base": "0.47.0", @@ -40416,6 +40450,7 @@ "version": "file:experimental/packages/exporter-trace-otlp-proto", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.20.0", "@opentelemetry/otlp-exporter-base": "0.47.0", @@ -40587,6 +40622,7 @@ "version": "file:packages/opentelemetry-exporter-zipkin", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "^1.0.0", "@opentelemetry/core": "1.20.0", "@opentelemetry/resources": "1.20.0", @@ -40758,6 +40794,7 @@ "version": "file:experimental/packages/opentelemetry-instrumentation", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/sdk-metrics": "1.20.0", "@types/mocha": "10.0.6", @@ -40932,6 +40969,7 @@ "version": "file:experimental/packages/opentelemetry-instrumentation-fetch", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/core": "1.20.0", @@ -41180,6 +41218,7 @@ "version": "file:experimental/packages/opentelemetry-instrumentation-xml-http-request", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/core": "1.20.0", @@ -41353,6 +41392,7 @@ "version": "file:experimental/packages/opentelemetry-browser-detector", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/resources": "1.20.0", "@opentelemetry/semantic-conventions": "1.20.0", @@ -41519,6 +41559,7 @@ "version": "file:experimental/packages/otlp-exporter-base", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.20.0", "@types/mocha": "10.0.6", @@ -41684,6 +41725,7 @@ "version": "file:experimental/packages/otlp-grpc-exporter-base", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@grpc/grpc-js": "^1.7.1", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.20.0", @@ -41712,6 +41754,7 @@ "version": "file:experimental/packages/otlp-proto-exporter-base", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "1.7.0", "@opentelemetry/core": "1.20.0", "@opentelemetry/otlp-exporter-base": "0.47.0", @@ -42116,6 +42159,7 @@ "version": "file:experimental/packages/sdk-logs", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.4.0 <1.8.0", "@opentelemetry/api-logs": "0.47.0", "@opentelemetry/core": "1.20.0", @@ -42317,6 +42361,7 @@ "version": "file:packages/sdk-metrics", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.3.0 <1.8.0", "@opentelemetry/core": "1.20.0", "@opentelemetry/resources": "1.20.0", @@ -42636,6 +42681,7 @@ "version": "file:packages/opentelemetry-sdk-trace-web", "requires": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/core": "1.20.0", @@ -58315,7 +58361,8 @@ "web-opentelemetry-example": { "version": "file:examples/opentelemetry-web", "requires": { - "@babel/core": "^7.6.0", + "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/core": "1.20.0", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 91c7ce8a190..f25af920cb1 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -54,6 +54,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts index 068107de42f..aea0dacb278 100644 --- a/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts +++ b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import 'zone.js/dist/zone'; +import 'zone.js'; import * as sinon from 'sinon'; import * as assert from 'assert'; import { ZoneContextManager } from '../src'; diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index 06beae1a0c2..1550e37387e 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -51,6 +51,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@types/mocha": "10.0.6", "@types/node": "18.6.5", "@types/sinon": "10.0.20", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 2a13d614367..c189d2b916e 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -61,6 +61,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": "^1.0.0", "@types/mocha": "10.0.6", "@types/node": "18.6.5", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 6d3da218afa..7167de9374e 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -56,6 +56,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.0.0 <1.8.0", "@opentelemetry/context-zone": "1.20.0", "@opentelemetry/propagator-b3": "1.20.0", diff --git a/packages/sdk-metrics/package.json b/packages/sdk-metrics/package.json index 95cbe1fc413..26db903db46 100644 --- a/packages/sdk-metrics/package.json +++ b/packages/sdk-metrics/package.json @@ -55,6 +55,7 @@ }, "devDependencies": { "@babel/core": "7.23.6", + "@babel/preset-env": "7.22.20", "@opentelemetry/api": ">=1.3.0 <1.8.0", "@types/lodash.merge": "4.6.9", "@types/mocha": "10.0.6",