Merge branch 'main' into chore/release-1.19.0-0.46.0

open-telemetry · Dec 14, 2023 · 3fc553c · 3fc553c
2 parents 9af1d53 + 02de4ab
commit 3fc553c
Show file tree

Hide file tree

Showing 30 changed files with 11,965 additions and 14,894 deletions.
diff --git a/api/package.json b/api/package.json
@@ -69,7 +69,7 @@
     "@types/mocha": "10.0.6",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.20",
-    "@types/webpack": "4.41.38",
+    "@types/webpack": "5.28.5",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
@@ -91,7 +91,7 @@
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
     "unionfs": "4.5.1",
-    "webpack": "4.46.0"
+    "webpack": "5.89.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api",
   "sideEffects": false

diff --git a/api/test/tree-shaking/tree-shaking.test.ts b/api/test/tree-shaking/tree-shaking.test.ts
@@ -24,6 +24,9 @@ import * as realFs from 'fs';
 /**
  * Verify that tree-shaking can be properly applied on the @opentelemetry/api package.
  * Unused optional apis should be able to be removed from the final bundle.
+ *
+ * Webpack doesn't run in node 8 because it requires BigInt. Since we are testing
+ * build tooling here, we can safely skip tooling we know can't run anyway.
  */
 describe('tree-shaking', () => {
   const allowedAPIs = ['ContextAPI', 'DiagAPI'];
@@ -56,11 +59,14 @@ describe('tree-shaking', () => {
   });
 
   for (const testAPI of testAPIs) {
-    it(`verify ${testAPI.name}`, async () => {
+    it(`verify ${testAPI.name}`, async function () {
+      if (parseInt(process.versions.node.split('.')[0], 10) < 10) {
+        this.skip();
+      }
       const sourceCode = `
-        import { ${testAPI.export} } from '../../';
-        console.log(${testAPI.export});
-      `;
+          import { ${testAPI.export} } from '../../';
+          console.log(${testAPI.export});
+        `;
       mfs.mkdirpSync(path.dirname(sourceCodePath));
       mfs.writeFileSync(sourceCodePath, sourceCode, { encoding: 'utf8' });
 

diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json
@@ -36,10 +36,10 @@
     "babel-loader": "^8.0.6",
     "ts-loader": "^9.2.6",
     "typescript": "^4.5.2",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.10.0",
+    "webpack": "^5.89.0",
+    "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.5.0",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.10.0"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",

diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json
@@ -82,7 +82,7 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0"
+    "webpack": "5.89.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-events",
   "sideEffects": false

diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json
@@ -82,7 +82,7 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0"
+    "webpack": "5.89.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-logs",
   "sideEffects": false

diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json
@@ -96,9 +96,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json
@@ -85,9 +85,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -87,9 +87,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -84,9 +84,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json
@@ -74,9 +74,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
@@ -87,9 +87,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.3.0"

diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json
@@ -80,9 +80,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -80,9 +80,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git 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.6.0",
+    "import-in-the-middle": "1.7.1",
     "require-in-the-middle": "^7.1.1",
     "semver": "^7.5.2",
     "shimmer": "^1.2.1"
@@ -107,9 +107,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "engines": {
     "node": ">=14"

diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json
@@ -85,9 +85,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0"

diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json
@@ -76,7 +76,7 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0"
+    "webpack": "5.89.0"
   },
   "dependencies": {
     "@opentelemetry/api-logs": "0.46.0",

diff --git a/experimental/packages/sdk-logs/package.json b/experimental/packages/sdk-logs/package.json
@@ -94,9 +94,9 @@
     "ts-loader": "8.4.0",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
-    "webpack": "4.46.0",
-    "webpack-cli": "4.10.0",
-    "webpack-merge": "5.9.0"
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4",
+    "webpack-merge": "5.10.0"
   },
   "dependencies": {
     "@opentelemetry/core": "1.19.0",