Skip to content

Commit

Permalink
Merge d365b3a into 5ecccc9
Browse files Browse the repository at this point in the history
  • Loading branch information
Flarna authored Apr 26, 2021
2 parents 5ecccc9 + d365b3a commit dd10134
Show file tree
Hide file tree
Showing 30 changed files with 38 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-host-metrics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-id-generator-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-dns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
"@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",
"sinon": "10.0.0",
"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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 3 additions & 4 deletions plugins/node/opentelemetry-instrumentation-hapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -58,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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
"@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",
"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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -61,7 +60,6 @@ export interface RedisResponseCustomAttributeFunction {
/**
* Options available for the IORedis Instrumentation (see [documentation](https:/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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-pg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion plugins/web/opentelemetry-plugin-react-load/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion propagators/opentelemetry-propagator-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion propagators/opentelemetry-propagator-ot-trace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

0 comments on commit dd10134

Please sign in to comment.