From 9bbdab4fa183eb92b2e0b4b993caffbd1d10da91 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Dec 2025 19:34:37 +0000 Subject: [PATCH 1/3] chore(deps): update dependency @rollup/plugin-commonjs to v29 --- package-lock.json | 85 +------------------ .../package.json | 2 +- 2 files changed, 3 insertions(+), 84 deletions(-) diff --git a/package-lock.json b/package-lock.json index 949b0dd712..bf3e7f7c76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10852,6 +10852,7 @@ "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-29.0.0.tgz", "integrity": "sha512-U2YHaxR2cU/yAiwKJtJRhnyLk7cifnQw0zUpISsocBDoHDJn+HTV74ABqnwr5bEgWUwFZC9oFL6wLe21lHu5eQ==", "dev": true, + "license": "MIT", "dependencies": { "@rollup/pluginutils": "^5.0.1", "commondir": "^1.0.1", @@ -39198,7 +39199,7 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-logs": "^0.208.0", "@opentelemetry/sdk-trace-base": "^1.0.0", - "@rollup/plugin-commonjs": "^26.0.0", + "@rollup/plugin-commonjs": "^29.0.0", "@rollup/plugin-node-resolve": "^15.2.3", "@web/dev-server-esbuild": "^1.0.1", "@web/dev-server-rollup": "^0.6.1", @@ -39271,31 +39272,6 @@ "node": ">=14" } }, - "packages/instrumentation-web-exception/node_modules/@rollup/plugin-commonjs": { - "version": "26.0.3", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-26.0.3.tgz", - "integrity": "sha512-2BJcolt43MY+y5Tz47djHkodCC3c1VKVrBDKpVqHKpQ9z9S158kCCqB8NF6/gzxLdNlYW9abB3Ibh+kOWLp8KQ==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^5.0.1", - "commondir": "^1.0.1", - "estree-walker": "^2.0.2", - "glob": "^10.4.1", - "is-reference": "1.2.1", - "magic-string": "^0.30.3" - }, - "engines": { - "node": ">=16.0.0 || 14 >= 14.17" - }, - "peerDependencies": { - "rollup": "^2.68.0||^3.0.0||^4.0.0" - }, - "peerDependenciesMeta": { - "rollup": { - "optional": true - } - } - }, "packages/instrumentation-web-exception/node_modules/@rollup/plugin-node-resolve": { "version": "15.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.1.tgz", @@ -39347,63 +39323,6 @@ "node": ">=4" } }, - "packages/instrumentation-web-exception/node_modules/glob": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "packages/instrumentation-web-exception/node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "packages/instrumentation-web-exception/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true - }, - "packages/instrumentation-web-exception/node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "packages/instrumentation-winston": { "name": "@opentelemetry/instrumentation-winston", "version": "0.53.0", diff --git a/packages/instrumentation-web-exception/package.json b/packages/instrumentation-web-exception/package.json index 1ccc040462..89571b6fa0 100644 --- a/packages/instrumentation-web-exception/package.json +++ b/packages/instrumentation-web-exception/package.json @@ -55,7 +55,7 @@ "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-logs": "^0.208.0", "@opentelemetry/sdk-trace-base": "^1.0.0", - "@rollup/plugin-commonjs": "^26.0.0", + "@rollup/plugin-commonjs": "^29.0.0", "@rollup/plugin-node-resolve": "^15.2.3", "@web/dev-server-esbuild": "^1.0.1", "@web/dev-server-rollup": "^0.6.1", From ba0ea25a8b632abaace824c7b19ccd4c6b49fe4b Mon Sep 17 00:00:00 2001 From: overbalance Date: Wed, 10 Dec 2025 14:00:34 -0600 Subject: [PATCH 2/3] update rollup --- package-lock.json | 106 +----------------- .../package.json | 4 +- 2 files changed, 4 insertions(+), 106 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf3e7f7c76..b6abe54642 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16012,18 +16012,6 @@ "dev": true, "license": "MIT" }, - "node_modules/check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", - "dev": true, - "dependencies": { - "get-func-name": "^2.0.2" - }, - "engines": { - "node": "*" - } - }, "node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -17209,18 +17197,6 @@ } } }, - "node_modules/deep-eql": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", - "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", - "dev": true, - "dependencies": { - "type-detect": "^4.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/deep-equal": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", @@ -20174,15 +20150,6 @@ "node": "6.* || 8.* || >= 10.*" } }, - "node_modules/get-func-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", - "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/get-intrinsic": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", @@ -25161,15 +25128,6 @@ "loose-envify": "cli.js" } }, - "node_modules/loupe": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", - "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", - "dev": true, - "dependencies": { - "get-func-name": "^2.0.1" - } - }, "node_modules/lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", @@ -29993,15 +29951,6 @@ "node": ">=8" } }, - "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -39200,11 +39149,11 @@ "@opentelemetry/sdk-logs": "^0.208.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@rollup/plugin-commonjs": "^29.0.0", - "@rollup/plugin-node-resolve": "^15.2.3", + "@rollup/plugin-node-resolve": "^16.0.3", "@web/dev-server-esbuild": "^1.0.1", "@web/dev-server-rollup": "^0.6.1", "@web/test-runner": "^0.18.0", - "chai": "^4.3.10" + "chai": "^6.2.1" }, "engines": { "node": "^18.19.0 || >=20.6.0" @@ -39272,57 +39221,6 @@ "node": ">=14" } }, - "packages/instrumentation-web-exception/node_modules/@rollup/plugin-node-resolve": { - "version": "15.3.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.1.tgz", - "integrity": "sha512-tgg6b91pAybXHJQMAAwW9VuWBO6Thi+q7BCNARLwSqlmsHz0XYURtGvh/AuwSADXSI4h/2uHbs7s4FzlZDGSGA==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^5.0.1", - "@types/resolve": "1.20.2", - "deepmerge": "^4.2.2", - "is-module": "^1.0.0", - "resolve": "^1.22.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "rollup": "^2.78.0||^3.0.0||^4.0.0" - }, - "peerDependenciesMeta": { - "rollup": { - "optional": true - } - } - }, - "packages/instrumentation-web-exception/node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true, - "engines": { - "node": "*" - } - }, - "packages/instrumentation-web-exception/node_modules/chai": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", - "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", - "dev": true, - "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.3", - "deep-eql": "^4.1.3", - "get-func-name": "^2.0.2", - "loupe": "^2.3.6", - "pathval": "^1.1.1", - "type-detect": "^4.1.0" - }, - "engines": { - "node": ">=4" - } - }, "packages/instrumentation-winston": { "name": "@opentelemetry/instrumentation-winston", "version": "0.53.0", diff --git a/packages/instrumentation-web-exception/package.json b/packages/instrumentation-web-exception/package.json index 89571b6fa0..7f2058d2c9 100644 --- a/packages/instrumentation-web-exception/package.json +++ b/packages/instrumentation-web-exception/package.json @@ -56,11 +56,11 @@ "@opentelemetry/sdk-logs": "^0.208.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@rollup/plugin-commonjs": "^29.0.0", - "@rollup/plugin-node-resolve": "^15.2.3", + "@rollup/plugin-node-resolve": "^16.0.3", "@web/dev-server-esbuild": "^1.0.1", "@web/dev-server-rollup": "^0.6.1", "@web/test-runner": "^0.18.0", - "chai": "^4.3.10" + "chai": "^6.2.1" }, "dependencies": { "@opentelemetry/api-logs": "^0.208.0", From 44a385456ba91335e5f70301e63c0e03cba0b841 Mon Sep 17 00:00:00 2001 From: overbalance Date: Wed, 10 Dec 2025 14:13:52 -0600 Subject: [PATCH 3/3] new chai --- .../test/instrumentation.test.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/instrumentation-web-exception/test/instrumentation.test.ts b/packages/instrumentation-web-exception/test/instrumentation.test.ts index aba34a528c..0b684115ba 100644 --- a/packages/instrumentation-web-exception/test/instrumentation.test.ts +++ b/packages/instrumentation-web-exception/test/instrumentation.test.ts @@ -15,8 +15,8 @@ */ import { ExceptionInstrumentation } from '../src/instrumentation'; -// @ts-expect-error: not an export, but we want the prebundled version -import chai from 'chai/chai.js'; +// @ts-expect-error cjs still works +import { assert } from 'chai'; import { LoggerProvider, SimpleLogRecordProcessor, @@ -29,7 +29,6 @@ import { ATTR_EXCEPTION_TYPE, } from '@opentelemetry/semantic-conventions'; import { logs } from '@opentelemetry/api-logs'; -const assert = chai.assert; const STRING_ERROR = 'Some error string.';