From a3e2c446e37c69300735e2666abf17c9a7b36195 Mon Sep 17 00:00:00 2001 From: Naseem Date: Wed, 5 Aug 2020 22:18:15 -0400 Subject: [PATCH 1/5] fix: compilation issue with latest @types/mysql By importing the and using the ConnectionConfig and PoolActualConfig types. Signed-off-by: Naseem --- plugins/node/opentelemetry-plugin-mysql/package.json | 2 +- plugins/node/opentelemetry-plugin-mysql/src/types.ts | 7 ------- plugins/node/opentelemetry-plugin-mysql/src/utils.ts | 5 +++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/node/opentelemetry-plugin-mysql/package.json b/plugins/node/opentelemetry-plugin-mysql/package.json index 8d8c89da93..0fabcd0c21 100644 --- a/plugins/node/opentelemetry-plugin-mysql/package.json +++ b/plugins/node/opentelemetry-plugin-mysql/package.json @@ -46,7 +46,7 @@ "@opentelemetry/test-utils": "^0.9.0", "@opentelemetry/tracing": "0.10.1", "@types/mocha": "7.0.2", - "@types/mysql": "2.15.14", + "@types/mysql": "2.15.15", "@types/node": "12.12.47", "@types/shimmer": "1.0.1", "codecov": "3.7.1", diff --git a/plugins/node/opentelemetry-plugin-mysql/src/types.ts b/plugins/node/opentelemetry-plugin-mysql/src/types.ts index 71ad19e4de..349fadd58a 100644 --- a/plugins/node/opentelemetry-plugin-mysql/src/types.ts +++ b/plugins/node/opentelemetry-plugin-mysql/src/types.ts @@ -14,13 +14,6 @@ * limitations under the License. */ -export type ConnectionConfig = Partial<{ - host: string; - port: number; - database: string; - user: string; -}>; - export type Query = Partial<{ sql: string; }>; diff --git a/plugins/node/opentelemetry-plugin-mysql/src/utils.ts b/plugins/node/opentelemetry-plugin-mysql/src/utils.ts index 98d846f670..662ba1072e 100644 --- a/plugins/node/opentelemetry-plugin-mysql/src/utils.ts +++ b/plugins/node/opentelemetry-plugin-mysql/src/utils.ts @@ -16,7 +16,8 @@ import { Attributes } from '@opentelemetry/api'; import { AttributeNames } from './enums'; -import { ConnectionConfig, Query } from './types'; +import { Query } from './types'; +import { ConnectionConfig, PoolActualConfig } from 'mysql'; /** * Get a span name from a mysql query @@ -49,7 +50,7 @@ function getCommand(query: string | Query) { * * @param config ConnectionConfig */ -export function getConnectionAttributes(config: ConnectionConfig): Attributes { +export function getConnectionAttributes(config: ConnectionConfig | PoolActualConfig): Attributes { const { host, port, database, user } = getConfig(config); return { From 91e86600dc9f98b7bf15e68634b157180c4a00ce Mon Sep 17 00:00:00 2001 From: Naseem Date: Wed, 5 Aug 2020 22:37:20 -0400 Subject: [PATCH 2/5] fix: update dependencies to fix various build errors Signed-off-by: Naseem --- .../opentelemetry-plugin-dns/package.json | 20 +++++----- .../opentelemetry-plugin-express/package.json | 20 +++++----- .../opentelemetry-plugin-ioredis/package.json | 22 +++++------ .../opentelemetry-plugin-mongodb/package.json | 20 +++++----- .../opentelemetry-plugin-mysql/package.json | 20 +++++----- .../opentelemetry-plugin-pg-pool/package.json | 18 ++++----- .../node/opentelemetry-plugin-pg/package.json | 20 +++++----- .../opentelemetry-plugin-redis/package.json | 22 +++++------ .../package.json | 38 +++++++++---------- .../package.json | 18 ++++----- 10 files changed, 109 insertions(+), 109 deletions(-) diff --git a/plugins/node/opentelemetry-plugin-dns/package.json b/plugins/node/opentelemetry-plugin-dns/package.json index e85250645a..c06dd15c5e 100644 --- a/plugins/node/opentelemetry-plugin-dns/package.json +++ b/plugins/node/opentelemetry-plugin-dns/package.json @@ -41,16 +41,16 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/node": "0.10.1", - "@opentelemetry/tracing": "0.10.1", - "@types/mocha": "7.0.2", - "@types/node": "12.12.47", + "@opentelemetry/node": "0.10.2", + "@opentelemetry/tracing": "0.10.2", + "@types/mocha": "8.0.1", + "@types/node": "14.0.27", "@types/semver": "7.3.1", "@types/shimmer": "1.0.1", "@types/sinon": "9.0.4", - "codecov": "3.7.1", + "codecov": "3.7.2", "gts": "2.0.2", - "mocha": "7.2.0", + "mocha": "8.1.1", "nyc": "15.1.0", "rimraf": "3.0.2", "sinon": "9.0.2", @@ -58,12 +58,12 @@ "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6" + "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1", - "semver": "^7.1.3", + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2", + "semver": "^7.3.2", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-express/package.json b/plugins/node/opentelemetry-plugin-express/package.json index 4c6d652179..83f629bca8 100644 --- a/plugins/node/opentelemetry-plugin-express/package.json +++ b/plugins/node/opentelemetry-plugin-express/package.json @@ -41,28 +41,28 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.10.1", - "@opentelemetry/node": "0.10.1", - "@opentelemetry/tracing": "0.10.1", + "@opentelemetry/context-async-hooks": "0.10.2", + "@opentelemetry/node": "0.10.2", + "@opentelemetry/tracing": "0.10.2", "@types/express": "4.17.7", - "@types/mocha": "7.0.2", - "@types/node": "12.12.47", + "@types/mocha": "8.0.1", + "@types/node": "14.0.27", "@types/shimmer": "1.0.1", - "codecov": "3.7.1", + "codecov": "3.7.2", "express": "4.17.1", "gts": "2.0.2", - "mocha": "7.2.0", + "mocha": "8.1.1", "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "7.0.0", "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6" + "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1", + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-ioredis/package.json b/plugins/node/opentelemetry-plugin-ioredis/package.json index 07d232ccd5..3412215335 100644 --- a/plugins/node/opentelemetry-plugin-ioredis/package.json +++ b/plugins/node/opentelemetry-plugin-ioredis/package.json @@ -44,30 +44,30 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.10.1", - "@opentelemetry/node": "0.10.1", + "@opentelemetry/context-async-hooks": "0.10.2", + "@opentelemetry/node": "0.10.2", "@opentelemetry/test-utils": "^0.9.0", - "@opentelemetry/tracing": "0.10.1", - "@types/ioredis": "4.17.2", - "@types/mocha": "7.0.2", - "@types/node": "13.13.14", + "@opentelemetry/tracing": "0.10.2", + "@types/ioredis": "4.17.3", + "@types/mocha": "8.0.1", + "@types/node": "14.0.27", "@types/shimmer": "1.0.1", - "codecov": "3.7.1", + "codecov": "3.7.2", "cross-env": "7.0.2", "gts": "2.0.2", "ioredis": "4.17.3", - "mocha": "7.2.0", + "mocha": "8.1.1", "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "7.0.0", "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6" + "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1", + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-mongodb/package.json b/plugins/node/opentelemetry-plugin-mongodb/package.json index 0a27b23ebc..b4bf27a848 100644 --- a/plugins/node/opentelemetry-plugin-mongodb/package.json +++ b/plugins/node/opentelemetry-plugin-mongodb/package.json @@ -41,16 +41,16 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.10.1", - "@opentelemetry/node": "0.10.1", - "@opentelemetry/tracing": "0.10.1", - "@types/mocha": "7.0.2", + "@opentelemetry/context-async-hooks": "0.10.2", + "@opentelemetry/node": "0.10.2", + "@opentelemetry/tracing": "0.10.2", + "@types/mocha": "8.0.1", "@types/mongodb": "3.5.25", - "@types/node": "12.12.47", + "@types/node": "14.0.27", "@types/shimmer": "1.0.1", - "codecov": "3.7.1", + "codecov": "3.7.2", "gts": "2.0.2", - "mocha": "7.2.0", + "mocha": "8.1.1", "mongodb": "3.5.9", "nyc": "15.1.0", "rimraf": "3.0.2", @@ -58,11 +58,11 @@ "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6" + "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1", + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-mysql/package.json b/plugins/node/opentelemetry-plugin-mysql/package.json index 0fabcd0c21..98438bd0df 100644 --- a/plugins/node/opentelemetry-plugin-mysql/package.json +++ b/plugins/node/opentelemetry-plugin-mysql/package.json @@ -41,17 +41,17 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.10.1", - "@opentelemetry/node": "0.10.1", + "@opentelemetry/context-async-hooks": "0.10.2", + "@opentelemetry/node": "0.10.2", "@opentelemetry/test-utils": "^0.9.0", - "@opentelemetry/tracing": "0.10.1", - "@types/mocha": "7.0.2", + "@opentelemetry/tracing": "0.10.2", + "@types/mocha": "8.0.1", "@types/mysql": "2.15.15", - "@types/node": "12.12.47", + "@types/node": "14.0.27", "@types/shimmer": "1.0.1", - "codecov": "3.7.1", + "codecov": "3.7.2", "gts": "2.0.2", - "mocha": "7.2.0", + "mocha": "8.1.1", "mysql": "2.18.1", "nyc": "15.1.0", "rimraf": "3.0.2", @@ -59,11 +59,11 @@ "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6" + "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1", + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-pg-pool/package.json b/plugins/node/opentelemetry-plugin-pg-pool/package.json index b64935b258..3d4c5219ab 100644 --- a/plugins/node/opentelemetry-plugin-pg-pool/package.json +++ b/plugins/node/opentelemetry-plugin-pg-pool/package.json @@ -46,19 +46,19 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.10.1", + "@opentelemetry/context-async-hooks": "0.10.2", "@opentelemetry/plugin-pg": "^0.9.0", "@opentelemetry/test-utils": "^0.9.0", - "@opentelemetry/tracing": "0.10.1", - "@types/mocha": "7.0.2", - "@types/node": "12.12.47", + "@opentelemetry/tracing": "0.10.2", + "@types/mocha": "8.0.1", + "@types/node": "14.0.27", "@types/pg": "7.14.4", "@types/pg-pool": "2.0.2", "@types/shimmer": "1.0.1", - "codecov": "3.7.1", + "codecov": "3.7.2", "cross-env": "7.0.2", "gts": "2.0.2", - "mocha": "7.2.0", + "mocha": "8.1.1", "nyc": "15.1.0", "pg": "8.3.0", "pg-pool": "3.2.1", @@ -67,11 +67,11 @@ "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6" + "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1", + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-pg/package.json b/plugins/node/opentelemetry-plugin-pg/package.json index 8089b5ca39..8b4260491f 100644 --- a/plugins/node/opentelemetry-plugin-pg/package.json +++ b/plugins/node/opentelemetry-plugin-pg/package.json @@ -45,18 +45,18 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.10.1", - "@opentelemetry/node": "0.10.1", + "@opentelemetry/context-async-hooks": "0.10.2", + "@opentelemetry/node": "0.10.2", "@opentelemetry/test-utils": "^0.9.0", - "@opentelemetry/tracing": "0.10.1", - "@types/mocha": "7.0.2", - "@types/node": "12.12.47", + "@opentelemetry/tracing": "0.10.2", + "@types/mocha": "8.0.1", + "@types/node": "14.0.27", "@types/pg": "7.14.4", "@types/shimmer": "1.0.1", - "codecov": "3.7.1", + "codecov": "3.7.2", "cross-env": "7.0.2", "gts": "2.0.2", - "mocha": "7.2.0", + "mocha": "8.1.1", "nyc": "15.1.0", "pg": "8.3.0", "rimraf": "3.0.2", @@ -64,11 +64,11 @@ "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6" + "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1", + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2", "shimmer": "^1.2.1" } } diff --git a/plugins/node/opentelemetry-plugin-redis/package.json b/plugins/node/opentelemetry-plugin-redis/package.json index 6cf89214c8..07a81b4c90 100644 --- a/plugins/node/opentelemetry-plugin-redis/package.json +++ b/plugins/node/opentelemetry-plugin-redis/package.json @@ -43,18 +43,18 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-async-hooks": "0.10.1", - "@opentelemetry/node": "0.10.1", + "@opentelemetry/context-async-hooks": "0.10.2", + "@opentelemetry/node": "0.10.2", "@opentelemetry/test-utils": "^0.9.0", - "@opentelemetry/tracing": "0.10.1", - "@types/mocha": "7.0.2", - "@types/node": "12.12.47", - "@types/redis": "2.8.24", + "@opentelemetry/tracing": "0.10.2", + "@types/mocha": "8.0.1", + "@types/node": "14.0.27", + "@types/redis": "2.8.25", "@types/shimmer": "1.0.1", - "codecov": "3.7.1", + "codecov": "3.7.2", "cross-env": "7.0.2", "gts": "2.0.2", - "mocha": "7.2.0", + "mocha": "8.1.1", "nyc": "15.1.0", "redis": "3.0.2", "rimraf": "3.0.2", @@ -62,11 +62,11 @@ "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6" + "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1", + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2", "shimmer": "^1.2.1" } } diff --git a/plugins/web/opentelemetry-plugin-user-interaction/package.json b/plugins/web/opentelemetry-plugin-user-interaction/package.json index 5b9125d157..38b36db097 100644 --- a/plugins/web/opentelemetry-plugin-user-interaction/package.json +++ b/plugins/web/opentelemetry-plugin-user-interaction/package.json @@ -42,51 +42,51 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.10.4", - "@opentelemetry/context-base": "0.10.1", - "@opentelemetry/context-zone-peer-dep": "0.10.1", - "@opentelemetry/plugin-xml-http-request": "0.10.1", - "@opentelemetry/tracing": "0.10.1", - "@types/jquery": "3.5.0", - "@types/mocha": "7.0.2", - "@types/node": "12.12.47", + "@babel/core": "7.11.1", + "@opentelemetry/context-base": "0.10.2", + "@opentelemetry/context-zone-peer-dep": "0.10.2", + "@opentelemetry/plugin-xml-http-request": "0.10.2", + "@opentelemetry/tracing": "0.10.2", + "@types/jquery": "3.5.1", + "@types/mocha": "8.0.1", + "@types/node": "14.0.27", "@types/shimmer": "1.0.1", "@types/sinon": "9.0.4", "@types/webpack-env": "1.15.2", "@types/zone.js": "0.5.12", "babel-loader": "8.1.0", - "codecov": "3.7.1", + "codecov": "3.7.2", "gts": "2.0.2", "istanbul-instrumenter-loader": "3.0.1", - "karma": "5.1.0", + "karma": "5.1.1", "karma-chrome-launcher": "3.1.0", "karma-coverage-istanbul-reporter": "3.0.3", "karma-jquery": "0.2.4", "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.32", "karma-webpack": "4.0.2", - "mocha": "7.2.0", + "mocha": "8.1.1", "nyc": "15.1.0", "rimraf": "3.0.2", "sinon": "9.0.2", - "ts-loader": "8.0.0", + "ts-loader": "8.0.2", "ts-mocha": "7.0.0", "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6", - "webpack": "4.43.0", + "typescript": "3.9.7", + "webpack": "4.44.1", "webpack-cli": "3.3.12", - "webpack-merge": "5.0.9" + "webpack-merge": "5.1.1" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1", - "@opentelemetry/web": "^0.10.1", + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2", + "@opentelemetry/web": "^0.10.2", "shimmer": "^1.2.1" }, "peerDependencies": { - "zone.js": "^0.10.2" + "zone.js": "^0.10.3" }, "sideEffects": false } diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index e83b3824aa..0f43f16ef4 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -42,24 +42,24 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/context-base": "0.10.1", - "@types/mocha": "7.0.2", - "@types/node": "12.12.47", - "codecov": "3.7.1", + "@opentelemetry/context-base": "0.10.2", + "@types/mocha": "8.0.1", + "@types/node": "14.0.27", + "codecov": "3.7.2", "grpc": "1.24.3", "gts": "2.0.2", - "mocha": "6.2.3", + "mocha": "8.1.1", "nyc": "15.1.0", "rimraf": "3.0.2", - "ts-loader": "8.0.0", + "ts-loader": "8.0.2", "ts-mocha": "7.0.0", "ts-node": "8.10.2", "tslint-consistent-codestyle": "1.16.0", "tslint-microsoft-contrib": "6.2.0", - "typescript": "3.9.6" + "typescript": "3.9.7" }, "dependencies": { - "@opentelemetry/api": "^0.10.1", - "@opentelemetry/core": "^0.10.1" + "@opentelemetry/api": "^0.10.2", + "@opentelemetry/core": "^0.10.2" } } From 2847ffa3afbc7f4e8ed08f64a903313b2226cd0f Mon Sep 17 00:00:00 2001 From: Naseem Date: Thu, 6 Aug 2020 16:40:23 -0400 Subject: [PATCH 3/5] fix: lint Signed-off-by: Naseem --- plugins/node/opentelemetry-plugin-mysql/src/utils.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-plugin-mysql/src/utils.ts b/plugins/node/opentelemetry-plugin-mysql/src/utils.ts index 662ba1072e..4a0f8086b7 100644 --- a/plugins/node/opentelemetry-plugin-mysql/src/utils.ts +++ b/plugins/node/opentelemetry-plugin-mysql/src/utils.ts @@ -50,7 +50,9 @@ function getCommand(query: string | Query) { * * @param config ConnectionConfig */ -export function getConnectionAttributes(config: ConnectionConfig | PoolActualConfig): Attributes { +export function getConnectionAttributes( + config: ConnectionConfig | PoolActualConfig +): Attributes { const { host, port, database, user } = getConfig(config); return { From efb93b3e8d894fb7503cb03258837a16aaf64e8f Mon Sep 17 00:00:00 2001 From: Naseem Date: Thu, 6 Aug 2020 20:49:31 -0400 Subject: [PATCH 4/5] fix: revert mocha upgrade for node 8 Signed-off-by: Naseem --- plugins/node/opentelemetry-plugin-dns/package.json | 4 ++-- plugins/node/opentelemetry-plugin-express/package.json | 4 ++-- plugins/node/opentelemetry-plugin-ioredis/package.json | 4 ++-- plugins/node/opentelemetry-plugin-mongodb/package.json | 4 ++-- plugins/node/opentelemetry-plugin-mysql/package.json | 4 ++-- plugins/node/opentelemetry-plugin-pg-pool/package.json | 4 ++-- plugins/node/opentelemetry-plugin-pg/package.json | 4 ++-- plugins/node/opentelemetry-plugin-redis/package.json | 4 ++-- .../web/opentelemetry-plugin-user-interaction/package.json | 4 ++-- .../opentelemetry-propagator-grpc-census-binary/package.json | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/node/opentelemetry-plugin-dns/package.json b/plugins/node/opentelemetry-plugin-dns/package.json index c06dd15c5e..c6929327dd 100644 --- a/plugins/node/opentelemetry-plugin-dns/package.json +++ b/plugins/node/opentelemetry-plugin-dns/package.json @@ -43,14 +43,14 @@ "devDependencies": { "@opentelemetry/node": "0.10.2", "@opentelemetry/tracing": "0.10.2", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/semver": "7.3.1", "@types/shimmer": "1.0.1", "@types/sinon": "9.0.4", "codecov": "3.7.2", "gts": "2.0.2", - "mocha": "8.1.1", + "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", "sinon": "9.0.2", diff --git a/plugins/node/opentelemetry-plugin-express/package.json b/plugins/node/opentelemetry-plugin-express/package.json index 83f629bca8..7957c94cb5 100644 --- a/plugins/node/opentelemetry-plugin-express/package.json +++ b/plugins/node/opentelemetry-plugin-express/package.json @@ -45,13 +45,13 @@ "@opentelemetry/node": "0.10.2", "@opentelemetry/tracing": "0.10.2", "@types/express": "4.17.7", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/shimmer": "1.0.1", "codecov": "3.7.2", "express": "4.17.1", "gts": "2.0.2", - "mocha": "8.1.1", + "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "7.0.0", diff --git a/plugins/node/opentelemetry-plugin-ioredis/package.json b/plugins/node/opentelemetry-plugin-ioredis/package.json index 3412215335..774abaea7c 100644 --- a/plugins/node/opentelemetry-plugin-ioredis/package.json +++ b/plugins/node/opentelemetry-plugin-ioredis/package.json @@ -49,14 +49,14 @@ "@opentelemetry/test-utils": "^0.9.0", "@opentelemetry/tracing": "0.10.2", "@types/ioredis": "4.17.3", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/shimmer": "1.0.1", "codecov": "3.7.2", "cross-env": "7.0.2", "gts": "2.0.2", "ioredis": "4.17.3", - "mocha": "8.1.1", + "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", "ts-mocha": "7.0.0", diff --git a/plugins/node/opentelemetry-plugin-mongodb/package.json b/plugins/node/opentelemetry-plugin-mongodb/package.json index b4bf27a848..4e65b8c735 100644 --- a/plugins/node/opentelemetry-plugin-mongodb/package.json +++ b/plugins/node/opentelemetry-plugin-mongodb/package.json @@ -44,13 +44,13 @@ "@opentelemetry/context-async-hooks": "0.10.2", "@opentelemetry/node": "0.10.2", "@opentelemetry/tracing": "0.10.2", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/mongodb": "3.5.25", "@types/node": "14.0.27", "@types/shimmer": "1.0.1", "codecov": "3.7.2", "gts": "2.0.2", - "mocha": "8.1.1", + "mocha": "7.2.0", "mongodb": "3.5.9", "nyc": "15.1.0", "rimraf": "3.0.2", diff --git a/plugins/node/opentelemetry-plugin-mysql/package.json b/plugins/node/opentelemetry-plugin-mysql/package.json index 98438bd0df..0d2d90b936 100644 --- a/plugins/node/opentelemetry-plugin-mysql/package.json +++ b/plugins/node/opentelemetry-plugin-mysql/package.json @@ -45,13 +45,13 @@ "@opentelemetry/node": "0.10.2", "@opentelemetry/test-utils": "^0.9.0", "@opentelemetry/tracing": "0.10.2", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/mysql": "2.15.15", "@types/node": "14.0.27", "@types/shimmer": "1.0.1", "codecov": "3.7.2", "gts": "2.0.2", - "mocha": "8.1.1", + "mocha": "7.2.0", "mysql": "2.18.1", "nyc": "15.1.0", "rimraf": "3.0.2", diff --git a/plugins/node/opentelemetry-plugin-pg-pool/package.json b/plugins/node/opentelemetry-plugin-pg-pool/package.json index 3d4c5219ab..7525e29c66 100644 --- a/plugins/node/opentelemetry-plugin-pg-pool/package.json +++ b/plugins/node/opentelemetry-plugin-pg-pool/package.json @@ -50,7 +50,7 @@ "@opentelemetry/plugin-pg": "^0.9.0", "@opentelemetry/test-utils": "^0.9.0", "@opentelemetry/tracing": "0.10.2", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/pg": "7.14.4", "@types/pg-pool": "2.0.2", @@ -58,7 +58,7 @@ "codecov": "3.7.2", "cross-env": "7.0.2", "gts": "2.0.2", - "mocha": "8.1.1", + "mocha": "7.2.0", "nyc": "15.1.0", "pg": "8.3.0", "pg-pool": "3.2.1", diff --git a/plugins/node/opentelemetry-plugin-pg/package.json b/plugins/node/opentelemetry-plugin-pg/package.json index 8b4260491f..61812cf413 100644 --- a/plugins/node/opentelemetry-plugin-pg/package.json +++ b/plugins/node/opentelemetry-plugin-pg/package.json @@ -49,14 +49,14 @@ "@opentelemetry/node": "0.10.2", "@opentelemetry/test-utils": "^0.9.0", "@opentelemetry/tracing": "0.10.2", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/pg": "7.14.4", "@types/shimmer": "1.0.1", "codecov": "3.7.2", "cross-env": "7.0.2", "gts": "2.0.2", - "mocha": "8.1.1", + "mocha": "7.2.0", "nyc": "15.1.0", "pg": "8.3.0", "rimraf": "3.0.2", diff --git a/plugins/node/opentelemetry-plugin-redis/package.json b/plugins/node/opentelemetry-plugin-redis/package.json index 07a81b4c90..389bff65bc 100644 --- a/plugins/node/opentelemetry-plugin-redis/package.json +++ b/plugins/node/opentelemetry-plugin-redis/package.json @@ -47,14 +47,14 @@ "@opentelemetry/node": "0.10.2", "@opentelemetry/test-utils": "^0.9.0", "@opentelemetry/tracing": "0.10.2", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/redis": "2.8.25", "@types/shimmer": "1.0.1", "codecov": "3.7.2", "cross-env": "7.0.2", "gts": "2.0.2", - "mocha": "8.1.1", + "mocha": "7.2.0", "nyc": "15.1.0", "redis": "3.0.2", "rimraf": "3.0.2", diff --git a/plugins/web/opentelemetry-plugin-user-interaction/package.json b/plugins/web/opentelemetry-plugin-user-interaction/package.json index 38b36db097..1361e362e1 100644 --- a/plugins/web/opentelemetry-plugin-user-interaction/package.json +++ b/plugins/web/opentelemetry-plugin-user-interaction/package.json @@ -48,7 +48,7 @@ "@opentelemetry/plugin-xml-http-request": "0.10.2", "@opentelemetry/tracing": "0.10.2", "@types/jquery": "3.5.1", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/node": "14.0.27", "@types/shimmer": "1.0.1", "@types/sinon": "9.0.4", @@ -65,7 +65,7 @@ "karma-mocha": "2.0.1", "karma-spec-reporter": "0.0.32", "karma-webpack": "4.0.2", - "mocha": "8.1.1", + "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", "sinon": "9.0.2", diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 0f43f16ef4..d1166d3862 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -43,12 +43,12 @@ }, "devDependencies": { "@opentelemetry/context-base": "0.10.2", - "@types/mocha": "8.0.1", + "@types/mocha": "7.0.2", "@types/node": "14.0.27", "codecov": "3.7.2", "grpc": "1.24.3", "gts": "2.0.2", - "mocha": "8.1.1", + "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "3.0.2", "ts-loader": "8.0.2", From c2dc696d1f102c6315166fa6da25397d317bbf8e Mon Sep 17 00:00:00 2001 From: Naseem Date: Sat, 8 Aug 2020 14:55:42 -0400 Subject: [PATCH 5/5] Update plugins/node/opentelemetry-plugin-mysql/src/utils.ts Co-authored-by: Daniel Dyla --- plugins/node/opentelemetry-plugin-mysql/src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-plugin-mysql/src/utils.ts b/plugins/node/opentelemetry-plugin-mysql/src/utils.ts index 4a0f8086b7..f1036abcc4 100644 --- a/plugins/node/opentelemetry-plugin-mysql/src/utils.ts +++ b/plugins/node/opentelemetry-plugin-mysql/src/utils.ts @@ -17,7 +17,7 @@ import { Attributes } from '@opentelemetry/api'; import { AttributeNames } from './enums'; import { Query } from './types'; -import { ConnectionConfig, PoolActualConfig } from 'mysql'; +import type { ConnectionConfig, PoolActualConfig } from 'mysql'; /** * Get a span name from a mysql query