From ca099bc4f60f2b85da4b8d359fc5b86a4f2c91cd Mon Sep 17 00:00:00 2001 From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com> Date: Mon, 26 Apr 2021 16:34:18 +0200 Subject: [PATCH 1/3] chore: update typescript, gts and eslint --- .../package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 2 +- metapackages/auto-instrumentations-web/package.json | 2 +- package.json | 10 +++++----- packages/opentelemetry-host-metrics/package.json | 2 +- .../opentelemetry-id-generator-aws-xray/package.json | 2 +- packages/opentelemetry-test-utils/package.json | 2 +- .../package.json | 4 ++-- .../opentelemetry-instrumentation-bunyan/package.json | 2 +- .../opentelemetry-instrumentation-dns/package.json | 4 ++-- .../opentelemetry-instrumentation-express/package.json | 2 +- .../opentelemetry-instrumentation-graphql/package.json | 2 +- .../opentelemetry-instrumentation-hapi/package.json | 2 +- .../opentelemetry-instrumentation-ioredis/package.json | 4 ++-- .../opentelemetry-instrumentation-koa/package.json | 2 +- .../opentelemetry-instrumentation-mongodb/package.json | 2 +- .../opentelemetry-instrumentation-mysql/package.json | 2 +- .../opentelemetry-instrumentation-net/package.json | 2 +- .../node/opentelemetry-instrumentation-pg/package.json | 2 +- .../opentelemetry-instrumentation-pino/package.json | 2 +- .../opentelemetry-instrumentation-redis/package.json | 2 +- .../opentelemetry-instrumentation-restify/package.json | 2 +- .../opentelemetry-instrumentation-winston/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../web/opentelemetry-plugin-react-load/package.json | 2 +- .../opentelemetry-propagator-aws-xray/package.json | 2 +- .../package.json | 2 +- .../opentelemetry-propagator-ot-trace/package.json | 2 +- 29 files changed, 36 insertions(+), 36 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 6b9eb43950..f700cfb690 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -53,7 +53,7 @@ "rimraf": "3.0.2", "sinon": "10.0.0", "ts-mocha": "8.0.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "1.0.0-rc.0", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 7882967799..fa1b25eef3 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -39,7 +39,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 3f17c4654b..d07ac5da10 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -48,7 +48,7 @@ "sinon": "10.0.0", "ts-loader": "8.0.14", "ts-mocha": "8.0.0", - "typescript": "4.1.3", + "typescript": "4.2.4", "webpack": "4.46.0", "webpack-cli": "4.3.1", "webpack-merge": "5.7.3" diff --git a/package.json b/package.json index 47e6a7ee98..fe7b6b6b4c 100644 --- a/package.json +++ b/package.json @@ -42,17 +42,17 @@ "devDependencies": { "@commitlint/cli": "11.0.0", "@commitlint/config-conventional": "11.0.0", - "@typescript-eslint/eslint-plugin": "4.3.0", - "@typescript-eslint/parser": "4.3.0", - "eslint": "7.19.0", - "eslint-config-airbnb-base": "14.2.0", + "@typescript-eslint/eslint-plugin": "4.22.0", + "@typescript-eslint/parser": "4.22.0", + "eslint": "7.25.0", + "eslint-config-airbnb-base": "14.2.1", "eslint-plugin-header": "3.1.1", "eslint-plugin-import": "2.22.1", "gts": "3.1.0", "husky": "4.2.5", "lerna": "3.22.1", "lerna-changelog": "1.0.1", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "husky": { "hooks": { diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index 3e026444c6..4620c8c3b7 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -52,7 +52,7 @@ "rimraf": "3.0.2", "sinon": "10.0.0", "ts-mocha": "8.0.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index f91d4f00b4..a72621b58d 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -63,7 +63,7 @@ "sinon": "10.0.0", "ts-loader": "8.0.12", "ts-mocha": "8.0.0", - "typescript": "4.1.3", + "typescript": "4.2.4", "webpack": "4.46.0" }, "dependencies": { diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 15291b6a8f..c9ac84c2ad 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -28,7 +28,7 @@ "gts": "3.1.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index bf02d9cd9b..23db4cd151 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -46,14 +46,14 @@ "@types/mocha": "7.0.2", "@types/node": "14.0.27", "codecov": "3.7.2", - "gts": "2.0.2", + "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.7" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 384b03ad26..8ebe70f0d6 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -59,7 +59,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 6721e7c736..8cae4b40ff 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -50,7 +50,7 @@ "@types/shimmer": "1.0.1", "@types/sinon": "9.0.4", "codecov": "3.7.2", - "gts": "2.0.2", + "gts": "3.1.0", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", @@ -58,7 +58,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.7" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index f3de756e4d..bae14674dc 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -57,7 +57,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index fc904d8795..ae2b5af664 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -54,7 +54,7 @@ "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "8.0.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 9051dedc47..507395d8a2 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -58,7 +58,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 4ac989cd78..5fca4a92ba 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -54,7 +54,7 @@ "@types/shimmer": "1.0.1", "codecov": "3.7.2", "cross-env": "7.0.2", - "gts": "2.0.2", + "gts": "3.1.0", "ioredis": "4.17.3", "mocha": "7.2.0", "nyc": "15.1.0", @@ -62,7 +62,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.7" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 49f4eb8ddf..fd3c49b9aa 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -60,7 +60,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 6e739b5da2..37d91f8b56 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -58,7 +58,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 74eae42227..d7162f031d 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -56,7 +56,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index df61492a28..4911f5d776 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -56,7 +56,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 3dbb9aa617..661da538e0 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -66,7 +66,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index f0f8ead33d..c30139250c 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -61,7 +61,7 @@ "ts-node": "9.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index a63dd958cf..55a2b5ec4b 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -60,7 +60,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 480fef81c9..c3aa2336ea 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -56,7 +56,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 1c904536b5..0f33931739 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -57,7 +57,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3", + "typescript": "4.2.4", "winston": "3.3.3", "winston2": "npm:winston@2.4.5" }, diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 1724f2e245..ab4866148b 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -65,7 +65,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3", + "typescript": "4.2.4", "webpack": "4.43.0", "webpack-cli": "4.0.0", "webpack-merge": "5.0.9" diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 3a7a7937f8..36aac10c35 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -71,7 +71,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3", + "typescript": "4.2.4", "webpack": "4.44.1", "webpack-cli": "4.0.0", "webpack-merge": "5.1.1", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 17a4035ec8..ade2de8bba 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -72,7 +72,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3", + "typescript": "4.2.4", "webpack": "4.43.0", "webpack-cli": "4.0.0", "webpack-merge": "5.2.0" diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index e78c9e0294..fd044ffd14 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -59,7 +59,7 @@ "rimraf": "3.0.2", "ts-loader": "8.0.12", "ts-mocha": "8.0.0", - "typescript": "4.1.3", + "typescript": "4.2.4", "webpack": "4.46.0" }, "dependencies": { diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 86190c9987..008592a695 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -54,7 +54,7 @@ "ts-mocha": "8.0.0", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "4.1.3" + "typescript": "4.2.4" }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0" diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 7746b87150..9d86228fef 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -62,7 +62,7 @@ "nyc": "15.1.0", "ts-loader": "8.0.12", "ts-mocha": "8.0.0", - "typescript": "4.1.3", + "typescript": "4.2.4", "webpack": "4.46.0" } } From d89d486aa49cfee68e3299cb20d5bf8bfcd8ddd8 Mon Sep 17 00:00:00 2001 From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com> Date: Mon, 26 Apr 2021 16:55:38 +0200 Subject: [PATCH 2/3] chore: update hapi --- plugins/node/opentelemetry-instrumentation-hapi/package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 507395d8a2..c22f3cfe91 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -41,12 +41,11 @@ "access": "public" }, "devDependencies": { - "@hapi/hapi": "20.0.1", - "@hapi/podium": "4.1.1", + "@hapi/hapi": "20.1.2", "@opentelemetry/context-async-hooks": "0.19.0", "@opentelemetry/node": "0.19.0", "@opentelemetry/tracing": "0.19.0", - "@types/hapi__hapi": "20.0.1", + "@types/hapi__hapi": "20.0.8", "@types/mocha": "7.0.2", "@types/node": "12.12.47", "codecov": "3.7.0", From 2f836856fb0942f99dfa6acab33e1fc548165991 Mon Sep 17 00:00:00 2001 From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com> Date: Mon, 26 Apr 2021 17:01:21 +0200 Subject: [PATCH 3/3] chore: fix lint --- plugins/node/opentelemetry-instrumentation-ioredis/src/types.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/src/types.ts b/plugins/node/opentelemetry-instrumentation-ioredis/src/types.ts index 4119c97415..8b0334313f 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/src/types.ts +++ b/plugins/node/opentelemetry-instrumentation-ioredis/src/types.ts @@ -18,7 +18,6 @@ import type * as ioredisTypes from 'ioredis'; import { InstrumentationConfig } from '@opentelemetry/instrumentation'; import { Span } from '@opentelemetry/api'; -// eslint-disable-next-line @typescript-eslint/interface-name-prefix export interface IORedisCommand { reject: (err: Error) => void; resolve: (result: {}) => void; @@ -61,7 +60,6 @@ export interface RedisResponseCustomAttributeFunction { /** * Options available for the IORedis Instrumentation (see [documentation](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-ioredis#ioredis-instrumentation-options)) */ -// eslint-disable-next-line @typescript-eslint/interface-name-prefix export interface IORedisInstrumentationConfig extends InstrumentationConfig { /** Custom serializer function for the db.statement tag */ dbStatementSerializer?: DbStatementSerializer;