Merge branch 'main' into add-aggregation-selector-to-otlp-metric-expo…

…rter
open-telemetry · Jan 18, 2024 · 86df50a · 86df50a
2 parents d689f47 + 43e598e
commit 86df50a
Show file tree

Hide file tree

Showing 27 changed files with 75 additions and 481 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 * chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 [#4320](https://github.com/open-telemetry/opentelemetry-js/pull/4320)
 * refactor(core): drop unnecessary assignment of HOSTNAME [#4421](https://github.com/open-telemetry/opentelemetry-js/pull/4421) @pichlermarc
+* test(opentelemetry-context-zone-peer-dep): transpile zone.js in tests [#4423](https://github.com/open-telemetry/opentelemetry-js/pull/4423) @legendecas
 
 ## 1.20.0
 

diff --git 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
@@ -48,7 +48,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.23.6",
     "@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
@@ -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
@@ -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
@@ -47,7 +47,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.23.6",
     "@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
@@ -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
@@ -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
@@ -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
@@ -47,7 +47,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.23.6",
     "@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
@@ -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
@@ -55,7 +55,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.23.6",
     "@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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -48,7 +48,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.23.6",
     "@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
@@ -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
@@ -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/[email protected]",

diff --git 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?$)/,