Skip to content

build: upgrade TypeScript to 5.9.2, fix CommonJS module resolution #3032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

build: upgrade TypeScript to 5.9.2, fix CommonJS module resolution #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6de5671
refactor(devDeps): hoist devDeps, prep for TS upgrade
overbalance Sep 10, 2025
7b03068
fix(instrumentation-socket.io): update to expect v29 import syntax
overbalance Sep 10, 2025
e14c81d
fix(instrumentation-dns): resolve TypeScript type mismatches
overbalance Sep 10, 2025
c7e98fd
test(instrumentation-aws-sdk): fix Content-Length headers in nock moc…
overbalance Sep 10, 2025
01ca103
test(instrumentation-openai): configure Mocha for ESM/TypeScript, add…
overbalance Sep 10, 2025
362b8b2
test(resource-detector-gcp): configure Mocha for ESM/TypeScript, add …
overbalance Sep 10, 2025
99caa71
chore: upgrade to TypeScript 5.9.2, adjust module resolution for Comm…
overbalance Sep 10, 2025
53cd5c9
chore: remove unused jQuery dependencies from instrumentation packages
overbalance Sep 10, 2025
9fe9610
fix(karma-webpack): use fully specified process/browser.js for webpac…
overbalance Sep 10, 2025
c121885
fix(karma): load karma plugins from root package.json
overbalance Sep 10, 2025
27009e2
use axios class
overbalance Sep 17, 2025
d47665a
fix(instrumentation): remove redis devDep for TAV compatibility
overbalance Sep 17, 2025
78dc21c
patch openai and gcp
overbalance Sep 17, 2025
6fc6d82
repair linux deps
overbalance Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .mocharc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"require": ["ts-node/register/transpile-only"]
}
1 change: 0 additions & 1 deletion .mocharc.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion examples/express/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ setupTracing('example-express-server');

// Require in rest of modules
import * as express from 'express';
import * as axios from 'axios';
import axios from 'axios';
import { RequestHandler } from 'express';

// Setup express
Expand Down
2 changes: 1 addition & 1 deletion karma.webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = {
// because the `util` package expects there to be a global variable named `process`.
// Thanks to https://stackoverflow.com/a/65018686/14239942
// NOTE: I wish there was a better way as this pollutes the tests with a defined 'process' global.
process: 'process/browser'
process: 'process/browser.js'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a warning that suggested this change.

})
],
module: {
Expand Down
37,641 changes: 16,071 additions & 21,570 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 31 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,54 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"devDependencies": {
"@babel/core": "^7.28.4",
"@babel/preset-env": "^7.28.3",
"@types/mocha": "^10.0.10",
"@types/node": "^20.19.13",
"@types/semver": "^7.7.1",
"@types/shimmer": "^1.2.0",
"@types/sinon": "^17.0.4",
"@types/webpack-env": "^1.18.8",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"cross-env": "^7.0.3",
"assert": "^2.1.0",
"babel-loader": "^10.0.0",
"babel-plugin-istanbul": "^7.0.1",
"cross-env": "^10.0.0",
"eslint": "8.7.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "4.2.5",
"expect": "^29.7.0",
"glob": "^11.0.3",
"karma": "^6.4.4",
"karma-chrome-launcher": "^3.2.0",
"karma-coverage": "^2.2.1",
"karma-mocha": "^2.0.1",
"karma-spec-reporter": "^0.0.36",
"karma-webpack": "^5.0.1",
"lerna": "8.2.3",
"lerna-changelog": "2.2.0",
"markdownlint-cli2": "0.13.0",
"minimatch": "^9.0.3",
"mocha": "^11.0.0",
"nock": "^14.0.10",
"nyc": "^17.1.0",
"prettier": "2.8.8",
"process": "0.11.10",
"semver": "^7.6.0",
"rimraf": "5.0.10",
"semver": "^7.7.2",
"sinon": "^15.1.2",
"test-all-versions": "^6.2.0",
"ts-loader": "^9.5.4",
"ts-node": "10.9.2",
"typescript": "5.0.4",
"util": "0.12.5"
"typescript": "5.9.2",
"util": "0.12.5",
"webpack": "^5.101.3",
"webpack-cli": "^6.0.1",
"webpack-merge": "^6.0.1"
},
"changelog": {
"labels": {
Expand Down
9 changes: 1 addition & 8 deletions packages/auto-configuration-propagators/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,7 @@
"@opentelemetry/api": "^1.4.1"
},
"devDependencies": {
"@opentelemetry/api": "^1.4.1",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"typescript": "5.0.4"
"@opentelemetry/api": "^1.4.1"
},
"dependencies": {
"@opentelemetry/core": "^2.0.0",
Expand Down
9 changes: 1 addition & 8 deletions packages/auto-instrumentations-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,7 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/core": "^2.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"typescript": "5.0.4"
"@opentelemetry/core": "^2.0.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.205.0",
Expand Down
25 changes: 1 addition & 24 deletions packages/auto-instrumentations-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,30 +38,7 @@
"zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0"
},
"devDependencies": {
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "^1.3.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"@types/webpack-env": "1.16.3",
"assert": "2.0.0",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "7.0.0",
"karma": "6.4.4",
"karma-chrome-launcher": "3.1.0",
"karma-coverage": "2.2.1",
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "5.0.1",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.1.2",
"ts-loader": "9.5.4",
"typescript": "5.0.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"@opentelemetry/api": "^1.3.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.205.0",
Expand Down
8 changes: 1 addition & 7 deletions packages/baggage-log-record-processor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@
"@opentelemetry/sdk-logs": "^0.205.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"expect": "29.2.0",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"typescript": "5.0.4"
"@opentelemetry/api": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/baggage-log-record-processor#readme"
}
8 changes: 1 addition & 7 deletions packages/baggage-span-processor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,7 @@
"@opentelemetry/sdk-trace-base": "^2.0.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"expect": "29.2.0",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"typescript": "5.0.4"
"@opentelemetry/api": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/baggage-span-processor#readme"
}
6 changes: 2 additions & 4 deletions packages/contrib-test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
"@opentelemetry/api": "^1.3.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@types/node": "18.18.14",
"typescript": "5.0.4"
"@opentelemetry/api": "^1.3.0"
},
"dependencies": {
"@opentelemetry/core": "^2.0.0",
Expand All @@ -55,6 +53,6 @@
"@opentelemetry/sdk-node": "^0.205.0",
"@opentelemetry/sdk-trace-base": "^2.0.0",
"@opentelemetry/sdk-trace-node": "^2.0.0",
"@opentelemetry/semantic-conventions": "^1.27.0"
"@opentelemetry/semantic-conventions": "^1.37.0"
}
}
9 changes: 1 addition & 8 deletions packages/host-metrics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,7 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/sdk-metrics": "^2.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"typescript": "5.0.4"
"@opentelemetry/sdk-metrics": "^2.0.0"
},
"dependencies": {
"systeminformation": "5.23.8"
Expand Down
25 changes: 1 addition & 24 deletions packages/id-generator-aws-xray/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,30 +54,7 @@
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"@types/webpack-env": "1.16.3",
"assert": "2.0.0",
"babel-loader": "8.3.0",
"babel-plugin-istanbul": "7.0.0",
"karma": "6.4.4",
"karma-chrome-launcher": "3.1.0",
"karma-coverage": "2.2.1",
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "5.0.1",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.1.2",
"ts-loader": "9.5.4",
"typescript": "5.0.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/sdk-trace-base": "^2.0.0"
Expand Down
13 changes: 2 additions & 11 deletions packages/instrumentation-amqplib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,9 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.51.0",
"@types/amqplib": "^0.10.7",
"@types/lodash": "4.14.199",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"@types/lodash": "4.17.20",
"amqplib": "0.8.0",
"cross-env": "7.0.3",
"expect": "29.2.0",
"lodash": "4.17.21",
"nyc": "17.1.0",
"sinon": "15.2.0",
"test-all-versions": "6.1.0",
"typescript": "5.0.4"
"lodash": "4.17.21"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
Expand Down
7 changes: 1 addition & 6 deletions packages/instrumentation-aws-lambda/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,7 @@
"@opentelemetry/propagator-aws-xray-lambda": "^0.55.1",
"@opentelemetry/sdk-metrics": "^2.0.0",
"@opentelemetry/sdk-trace-base": "^2.0.0",
"@opentelemetry/sdk-trace-node": "^2.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"typescript": "5.0.4"
"@opentelemetry/sdk-trace-node": "^2.0.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.205.0",
Expand Down
13 changes: 1 addition & 12 deletions packages/instrumentation-aws-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,7 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.51.0",
"@opentelemetry/sdk-trace-base": "^2.0.0",
"@smithy/node-http-handler": "4.1.1",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"eslint": "8.7.0",
"expect": "29.2.0",
"nock": "13.3.3",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"test-all-versions": "6.1.0",
"typescript": "5.0.4"
"@smithy/node-http-handler": "4.1.1"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
Expand Down
6 changes: 4 additions & 2 deletions ...dk/test/mock-responses/bedrock-invokemodel-adds-amazon-nova-model-attributes-to-span.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"max_new_tokens": 10,
"temperature": 0.8,
"top_p": 1,
"stopSequences": ["|"]
"stopSequences": [
"|"
]
}
},
"status": 200,
Expand All @@ -36,7 +38,7 @@
"Content-Type",
"application/json",
"Content-Length",
"68",
"181",
"Connection",
"keep-alive",
"x-amzn-RequestId",
Expand Down
6 changes: 4 additions & 2 deletions ...k/test/mock-responses/bedrock-invokemodel-adds-amazon-titan-model-attributes-to-span.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"maxTokenCount": 10,
"temperature": 0.8,
"topP": 1,
"stopSequences": ["|"]
"stopSequences": [
"|"
]
}
},
"status": 200,
Expand All @@ -29,7 +31,7 @@
"Content-Type",
"application/json",
"Content-Length",
"143",
"147",
"Connection",
"keep-alive",
"x-amzn-RequestId",
Expand Down
6 changes: 4 additions & 2 deletions ...st/mock-responses/bedrock-invokemodel-adds-anthropic-claude-model-attributes-to-span.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
"max_tokens": 10,
"temperature": 0.8,
"top_p": 1,
"stop_sequences": ["|"]
"stop_sequences": [
"|"
]
},
"status": 200,
"response": {
Expand All @@ -36,7 +38,7 @@
"Content-Type",
"application/json",
"Content-Length",
"68",
"134",
"Connection",
"keep-alive",
"x-amzn-RequestId",
Expand Down
12 changes: 7 additions & 5 deletions ...test/mock-responses/bedrock-invokemodel-adds-cohere-command-model-attributes-to-span.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,26 @@
"max_tokens": 10,
"temperature": 0.8,
"p": 1,
"stop_sequences": ["|"]
"stop_sequences": [
"|"
]
},
"status": 200,
"response": {
"generations": [
{
"finish_reason": "max_tokens",
"text": "\nHello! I am a computer program designed to help you with"
"finish_reason": "max_tokens",
"text": "\nHello! I am a computer program designed to help you with"
}
]
]
},
"rawHeaders": [
"Date",
"Tue, 25 Mar 2025 23:50:27 GMT",
"Content-Type",
"application/json",
"Content-Length",
"68",
"116",
"Connection",
"keep-alive",
"x-amzn-RequestId",
Expand Down
Loading