Skip to content
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.

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

fix: various compilation errors #170

Merged
merged 5 commits into from
Aug 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions plugins/node/opentelemetry-plugin-dns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
16 changes: 8 additions & 8 deletions plugins/node/opentelemetry-plugin-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
18 changes: 9 additions & 9 deletions plugins/node/opentelemetry-plugin-ioredis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
16 changes: 8 additions & 8 deletions plugins/node/opentelemetry-plugin-mongodb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
18 changes: 9 additions & 9 deletions plugins/node/opentelemetry-plugin-mysql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
7 changes: 0 additions & 7 deletions plugins/node/opentelemetry-plugin-mysql/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}>;
7 changes: 5 additions & 2 deletions plugins/node/opentelemetry-plugin-mysql/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions plugins/node/opentelemetry-plugin-pg-pool/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
16 changes: 8 additions & 8 deletions plugins/node/opentelemetry-plugin-pg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
18 changes: 9 additions & 9 deletions plugins/node/opentelemetry-plugin-redis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
34 changes: 17 additions & 17 deletions plugins/web/opentelemetry-plugin-user-interaction/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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
}
Loading