diff --git a/plugins/node/opentelemetry-plugin-dns/package.json b/plugins/node/opentelemetry-plugin-dns/package.json index e85250645a..c6929327dd 100644 --- a/plugins/node/opentelemetry-plugin-dns/package.json +++ b/plugins/node/opentelemetry-plugin-dns/package.json @@ -41,14 +41,14 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/node": "0.10.1", - "@opentelemetry/tracing": "0.10.1", + "@opentelemetry/node": "0.10.2", + "@opentelemetry/tracing": "0.10.2", "@types/mocha": "7.0.2", - "@types/node": "12.12.47", + "@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", "nyc": "15.1.0", @@ -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..7957c94cb5 100644 --- a/plugins/node/opentelemetry-plugin-express/package.json +++ b/plugins/node/opentelemetry-plugin-express/package.json @@ -41,14 +41,14 @@ "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/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", @@ -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-ioredis/package.json b/plugins/node/opentelemetry-plugin-ioredis/package.json index 07d232ccd5..774abaea7c 100644 --- a/plugins/node/opentelemetry-plugin-ioredis/package.json +++ b/plugins/node/opentelemetry-plugin-ioredis/package.json @@ -44,15 +44,15 @@ "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", + "@opentelemetry/tracing": "0.10.2", + "@types/ioredis": "4.17.3", "@types/mocha": "7.0.2", - "@types/node": "13.13.14", + "@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", @@ -63,11 +63,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-mongodb/package.json b/plugins/node/opentelemetry-plugin-mongodb/package.json index 0a27b23ebc..4e65b8c735 100644 --- a/plugins/node/opentelemetry-plugin-mongodb/package.json +++ b/plugins/node/opentelemetry-plugin-mongodb/package.json @@ -41,14 +41,14 @@ "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/mocha": "7.0.2", "@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", "mongodb": "3.5.9", @@ -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 8d8c89da93..0d2d90b936 100644 --- a/plugins/node/opentelemetry-plugin-mysql/package.json +++ b/plugins/node/opentelemetry-plugin-mysql/package.json @@ -41,15 +41,15 @@ "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", + "@opentelemetry/tracing": "0.10.2", "@types/mocha": "7.0.2", - "@types/mysql": "2.15.14", - "@types/node": "12.12.47", + "@types/mysql": "2.15.15", + "@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", "mysql": "2.18.1", @@ -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-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..f1036abcc4 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 type { ConnectionConfig, PoolActualConfig } from 'mysql'; /** * Get a span name from a mysql query @@ -49,7 +50,9 @@ 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 { diff --git a/plugins/node/opentelemetry-plugin-pg-pool/package.json b/plugins/node/opentelemetry-plugin-pg-pool/package.json index b64935b258..7525e29c66 100644 --- a/plugins/node/opentelemetry-plugin-pg-pool/package.json +++ b/plugins/node/opentelemetry-plugin-pg-pool/package.json @@ -46,16 +46,16 @@ "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", + "@opentelemetry/tracing": "0.10.2", "@types/mocha": "7.0.2", - "@types/node": "12.12.47", + "@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", @@ -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..61812cf413 100644 --- a/plugins/node/opentelemetry-plugin-pg/package.json +++ b/plugins/node/opentelemetry-plugin-pg/package.json @@ -45,15 +45,15 @@ "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", + "@opentelemetry/tracing": "0.10.2", "@types/mocha": "7.0.2", - "@types/node": "12.12.47", + "@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", @@ -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..389bff65bc 100644 --- a/plugins/node/opentelemetry-plugin-redis/package.json +++ b/plugins/node/opentelemetry-plugin-redis/package.json @@ -43,15 +43,15 @@ "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", + "@opentelemetry/tracing": "0.10.2", "@types/mocha": "7.0.2", - "@types/node": "12.12.47", - "@types/redis": "2.8.24", + "@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", @@ -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..1361e362e1 100644 --- a/plugins/web/opentelemetry-plugin-user-interaction/package.json +++ b/plugins/web/opentelemetry-plugin-user-interaction/package.json @@ -42,23 +42,23 @@ "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", + "@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": "7.0.2", - "@types/node": "12.12.47", + "@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", @@ -69,24 +69,24 @@ "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..d1166d3862 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", + "@opentelemetry/context-base": "0.10.2", "@types/mocha": "7.0.2", - "@types/node": "12.12.47", - "codecov": "3.7.1", + "@types/node": "14.0.27", + "codecov": "3.7.2", "grpc": "1.24.3", "gts": "2.0.2", - "mocha": "6.2.3", + "mocha": "7.2.0", "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" } }