Skip to content

Commit

Permalink
chore(deps): update dependency @types/node to v16 (open-telemetry#852)
Browse files Browse the repository at this point in the history 
* chore(deps): update dependency @types/node to v16

* fix: typescript issues
  • Loading branch information
Amir Blum committed Jan 30, 2022
1 parent 18e4f93 commit 3887db0
Show file tree
Hide file tree
Showing 45 changed files with 57 additions and 49 deletions.
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
View file
Expand Up @@ -47,7 +47,7 @@
"@opentelemetry/api": "1.0.2",
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-aws/package.json
View file
Expand Up @@ -46,7 +46,7 @@
"@opentelemetry/api": "1.0.2",
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-gcp/package.json
View file
Expand Up @@ -47,7 +47,7 @@
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/core": "1.0.1",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/semver": "7.3.8",
"codecov": "3.8.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-github/package.json
View file
Expand Up @@ -49,7 +49,7 @@
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-node/package.json
View file
Expand Up @@ -33,7 +33,7 @@
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-web/package.json
View file
Expand Up @@ -35,7 +35,7 @@
"@babel/core": "7.15.0",
"@opentelemetry/api": "1.0.2",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"@types/webpack-env": "1.16.2",
"babel-loader": "8.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-host-metrics/package.json
View file
Expand Up @@ -49,7 +49,7 @@
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-id-generator-aws-xray/package.json
View file
Expand Up @@ -58,7 +58,7 @@
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"@types/webpack-env": "1.16.2",
"codecov": "3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-propagation-utils/package.json
View file
Expand Up @@ -41,7 +41,7 @@
},
"devDependencies": {
"@opentelemetry/api": "1.0.1",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"gts": "3.1.0",
"typescript": "4.3.5"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-test-utils/package.json
View file
Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"gts": "3.1.0",
"typescript": "4.3.5"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-tedious/package.json
View file
Expand Up @@ -53,7 +53,7 @@
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "^7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
View file
Expand Up @@ -51,7 +51,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"colors": "1.4.0",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-sdk/package.json
View file
Expand Up @@ -60,7 +60,7 @@
"@opentelemetry/api": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/mocha": "8.2.3",
"@types/node": "14.18.2",
"@types/node": "16.11.21",
"@types/sinon": "10.0.6",
"aws-sdk": "2.1008.0",
"eslint": "7.32.0",
Expand Down
18 changes: 13 additions & 5 deletions plugins/node/opentelemetry-instrumentation-aws-sdk/src/utils.ts
View file
Expand Up @@ -72,16 +72,24 @@ export const extractAttributesFromNormalizedRequest = (
};
};

export const bindPromise = (
target: Promise<any>,
export const bindPromise = <T = unknown>(
target: Promise<T>,
contextForCallbacks: Context,
rebindCount = 1
): Promise<any> => {
): Promise<T> => {
const origThen = target.then;
target.then = function (onFulfilled, onRejected) {
type PromiseThenParameters = Parameters<Promise<T>['then']>;
target.then = function <TResult1 = T, TResult2 = never>(
onFulfilled: PromiseThenParameters[0],
onRejected: PromiseThenParameters[1]
): Promise<TResult1 | TResult2> {
const newOnFulfilled = context.bind(contextForCallbacks, onFulfilled);
const newOnRejected = context.bind(contextForCallbacks, onRejected);
const patchedPromise = origThen.call(this, newOnFulfilled, newOnRejected);
const patchedPromise = origThen.call<
Promise<T>,
any[],
Promise<TResult1 | TResult2>
>(this, newOnFulfilled, newOnRejected);
return rebindCount > 1
? bindPromise(patchedPromise, contextForCallbacks, rebindCount - 1)
: patchedPromise;
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-bunyan/package.json
View file
Expand Up @@ -53,7 +53,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"bunyan": "1.8.15",
"codecov": "3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-cassandra/package.json
View file
Expand Up @@ -53,7 +53,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/semver": "7.3.8",
"@types/sinon": "10.0.2",
"cassandra-driver": "4.6.3",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-connect/package.json
View file
Expand Up @@ -50,7 +50,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.4",
"@types/node": "16.11.21",
"codecov": "3.8.2",
"connect": "3.7.0",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-dns/package.json
View file
Expand Up @@ -51,7 +51,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/semver": "7.3.8",
"@types/shimmer": "1.0.2",
"@types/sinon": "10.0.2",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-express/package.json
View file
Expand Up @@ -52,7 +52,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"express": "4.17.1",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-fastify/package.json
View file
Expand Up @@ -52,7 +52,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/express": "4.17.13",
"@types/mocha": "7.0.2",
"@types/node": "14.17.4",
"@types/node": "16.11.21",
"codecov": "3.8.2",
"fastify-express": "0.3.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-generic-pool/package.json
View file
Expand Up @@ -51,7 +51,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/semver": "7.3.8",
"codecov": "3.8.3",
"generic-pool": "3.8.2",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-graphql/package.json
View file
Expand Up @@ -51,7 +51,7 @@
"@opentelemetry/api": "1.0.2",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-hapi/package.json
View file
Expand Up @@ -52,7 +52,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-ioredis/package.json
View file
Expand Up @@ -57,7 +57,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "^10.0.6",
"codecov": "3.8.3",
"cross-env": "7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-knex/package.json
View file
Expand Up @@ -51,7 +51,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"knex": "0.95.9",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-koa/package.json
View file
Expand Up @@ -55,7 +55,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"koa": "2.13.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-memcached/package.json
View file
Expand Up @@ -54,7 +54,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"cross-env": "7.0.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mongodb/package.json
View file
Expand Up @@ -55,7 +55,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql/package.json
View file
Expand Up @@ -51,7 +51,7 @@
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql2/package.json
View file
Expand Up @@ -53,7 +53,7 @@
"@opentelemetry/contrib-test-utils": "^0.29.0",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-nestjs-core/package.json
View file
Expand Up @@ -59,7 +59,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.6",
"@types/node": "16.11.21",
"@types/semver": "7.3.8",
"@types/vinyl-fs": "2.4.12",
"codecov": "3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-net/package.json
View file
Expand Up @@ -51,7 +51,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-pg/package.json
View file
Expand Up @@ -60,7 +60,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"cross-env": "7.0.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-pino/package.json
View file
Expand Up @@ -53,7 +53,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/semver": "7.3.8",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-redis/package.json
View file
Expand Up @@ -56,7 +56,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"cross-env": "7.0.3",
"gts": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-restify/package.json
View file
Expand Up @@ -51,7 +51,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-router/package.json
View file
Expand Up @@ -51,7 +51,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"codecov": "3.8.3",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-winston/package.json
View file
Expand Up @@ -53,7 +53,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@opentelemetry/sdk-trace-node": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"codecov": "3.8.3",
"colors": "1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/web/opentelemetry-instrumentation-document-load/package.json
View file
Expand Up @@ -54,7 +54,7 @@
"@babel/core": "7.15.0",
"@opentelemetry/api": "1.0.2",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"@types/webpack-env": "1.16.2",
"babel-loader": "8.2.2",
Expand Down
2 changes: 1 addition & 1 deletion plugins/web/opentelemetry-instrumentation-long-task/package.json
View file
Expand Up @@ -53,7 +53,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/jquery": "3.5.6",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"@types/webpack-env": "1.16.2",
"babel-loader": "8.2.2",
Expand Down
2 changes: 1 addition & 1 deletion plugins/web/opentelemetry-instrumentation-user-interaction/package.json
View file
Expand Up @@ -55,7 +55,7 @@
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/jquery": "3.5.6",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/sinon": "10.0.2",
"@types/webpack-env": "1.16.2",
"babel-loader": "8.2.2",
Expand Down
2 changes: 1 addition & 1 deletion plugins/web/opentelemetry-plugin-react-load/package.json
View file
Expand Up @@ -52,7 +52,7 @@
"@opentelemetry/api": "1.0.2",
"@opentelemetry/propagator-b3": "1.0.1",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/node": "16.11.21",
"@types/react": "17.0.16",
"@types/react-addons-test-utils": "0.14.26",
"@types/react-dom": "17.0.9",
Expand Down

0 comments on commit 3887db0

Please sign in to comment.