Skip to content

Commit

Permalink
Merge branch 'main' into rm-legacy-port
Browse files Browse the repository at this point in the history
  • Loading branch information
mxiamxia authored May 25, 2021
2 parents 657d0b4 + af77aad commit 681aa0c
Show file tree
Hide file tree
Showing 28 changed files with 54 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"@types/mocha": "8.2.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "9.0.11",
"codecov": "3.8.2",
"gts": "3.1.0",
Expand All @@ -56,7 +56,7 @@
"typescript": "4.2.4"
},
"dependencies": {
"@opentelemetry/api": "1.0.0-rc.0",
"@opentelemetry/api": "1.0.0-rc.3",
"@opentelemetry/resources": "^0.19.0"
}
}
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"devDependencies": {
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "9.0.11",
"codecov": "3.8.2",
"gts": "3.1.0",
Expand Down
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"devDependencies": {
"@babel/core": "7.14.2",
"@babel/core": "7.14.3",
"@types/mocha": "8.2.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "9.0.11",
"@types/webpack-env": "1.16.0",
"babel-loader": "8.2.2",
Expand All @@ -47,7 +47,7 @@
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "10.0.0",
"ts-loader": "8.2.0",
"ts-loader": "8.3.0",
"ts-mocha": "8.0.0",
"typescript": "4.2.4",
"webpack": "4.46.0",
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
"devDependencies": {
"@commitlint/cli": "11.0.0",
"@commitlint/config-conventional": "11.0.0",
"@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"eslint": "7.26.0",
"@typescript-eslint/eslint-plugin": "4.24.0",
"@typescript-eslint/parser": "4.24.0",
"eslint": "7.27.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.23.0",
"eslint-plugin-import": "2.23.3",
"gts": "3.1.0",
"husky": "4.3.8",
"lerna": "3.22.1",
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 @@ -43,7 +43,7 @@
},
"devDependencies": {
"@types/mocha": "8.2.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "9.0.11",
"codecov": "3.8.2",
"gts": "3.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-id-generator-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
],
"devDependencies": {
"@types/mocha": "8.2.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "9.0.11",
"@types/webpack-env": "1.16.0",
"codecov": "3.8.2",
Expand All @@ -69,7 +69,7 @@
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "10.0.0",
"ts-loader": "8.2.0",
"ts-loader": "8.3.0",
"ts-mocha": "8.0.0",
"typescript": "4.2.4",
"webpack": "4.46.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"gts": "3.1.0",
"typescript": "4.2.4"
},
"dependencies": {
"@opentelemetry/api": "1.0.0-rc.0",
"@opentelemetry/api": "1.0.0-rc.3",
"@opentelemetry/core": "0.19.0",
"@opentelemetry/tracing": "0.19.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@opentelemetry/core": "0.19.0",
"@opentelemetry/node": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@opentelemetry/node": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "9.0.11",
"bunyan": "1.8.15",
"codecov": "3.8.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@opentelemetry/node": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/semver": "7.3.6",
"@types/shimmer": "1.0.1",
"@types/sinon": "9.0.11",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@opentelemetry/node": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"express": "4.17.1",
"gts": "3.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"devDependencies": {
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "8.2.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"graphql": "15.5.0",
"gts": "3.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
"@opentelemetry/test-utils": "^0.16.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"cross-env": "7.0.3",
"gts": "3.1.0",
"ioredis": "4.27.2",
"ioredis": "4.27.3",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
Expand All @@ -64,6 +64,6 @@
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/instrumentation": "^0.19.0",
"@opentelemetry/semantic-conventions": "^0.19.0",
"@types/ioredis": "4.26.3"
"@types/ioredis": "4.26.4"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
"@opentelemetry/node": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"gts": "3.1.0",
"mocha": "7.2.0",
"mongodb": "3.6.6",
"mongodb": "3.6.8",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"ts-mocha": "8.0.0",
Expand All @@ -61,6 +61,6 @@
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/instrumentation": "^0.19.0",
"@opentelemetry/semantic-conventions": "^0.19.0",
"@types/mongodb": "3.6.12"
"@types/mongodb": "3.6.16"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@opentelemetry/test-utils": "^0.16.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@opentelemetry/node": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "9.0.11",
"codecov": "3.8.2",
"gts": "3.1.0",
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-pg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@opentelemetry/test-utils": "^0.16.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"cross-env": "7.0.3",
"gts": "3.1.0",
Expand All @@ -68,7 +68,7 @@
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/instrumentation": "^0.19.0",
"@opentelemetry/semantic-conventions": "^0.19.0",
"@types/pg": "7.14.11",
"@types/pg": "8.6.0",
"@types/pg-pool": "2.0.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@opentelemetry/node": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/semver": "7.3.6",
"@types/sinon": "9.0.11",
"codecov": "3.8.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@opentelemetry/test-utils": "^0.16.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"cross-env": "7.0.3",
"gts": "3.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@opentelemetry/node": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"@opentelemetry/node": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
"codecov": "3.7.2",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"gts": "3.1.0",
"mocha": "7.2.0",
"nyc": "15.1.0",
Expand All @@ -55,10 +55,10 @@
"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",
"@opentelemetry/api": "1.0.0-rc.3",
"@opentelemetry/instrumentation": "^0.19.0",
"@opentelemetry/semantic-conventions": "^0.19.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@opentelemetry/node": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "9.0.11",
"codecov": "3.8.2",
"gts": "3.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.14.2",
"@babel/core": "7.14.3",
"@types/mocha": "8.2.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "10.0.0",
"@types/webpack-env": "1.16.0",
"babel-loader": "8.2.2",
Expand All @@ -66,7 +66,7 @@
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "10.0.0",
"ts-loader": "8.2.0",
"ts-loader": "8.3.0",
"ts-mocha": "8.0.0",
"typescript": "4.2.4",
"webpack": "4.46.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.14.2",
"@babel/core": "7.14.3",
"@opentelemetry/context-zone-peer-dep": "0.19.0",
"@opentelemetry/instrumentation-xml-http-request": "0.19.0",
"@opentelemetry/tracing": "0.19.0",
"@types/jquery": "3.5.5",
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/sinon": "9.0.11",
"@types/webpack-env": "1.16.0",
"babel-loader": "8.2.2",
Expand All @@ -71,7 +71,7 @@
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "10.0.0",
"ts-loader": "8.2.0",
"ts-loader": "8.3.0",
"ts-mocha": "8.0.0",
"typescript": "4.2.4",
"webpack": "4.46.0",
Expand Down
6 changes: 3 additions & 3 deletions plugins/web/opentelemetry-plugin-react-load/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.14.2",
"@babel/core": "7.14.3",
"@opentelemetry/propagator-b3": "0.19.0",
"@types/mocha": "7.0.2",
"@types/node": "12.20.13",
"@types/react": "17.0.5",
"@types/react": "17.0.6",
"@types/react-addons-test-utils": "0.14.25",
"@types/react-dom": "17.0.5",
"@types/shimmer": "1.0.1",
Expand All @@ -73,7 +73,7 @@
"react-dom": "17.0.2",
"rimraf": "3.0.2",
"sinon": "10.0.0",
"ts-loader": "8.2.0",
"ts-loader": "8.3.0",
"ts-mocha": "8.0.0",
"typescript": "4.2.4",
"webpack": "4.46.0",
Expand Down
4 changes: 2 additions & 2 deletions propagators/opentelemetry-propagator-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"devDependencies": {
"@types/mocha": "8.2.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"@types/webpack-env": "1.16.0",
"codecov": "3.8.2",
"gts": "3.1.0",
Expand All @@ -61,7 +61,7 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"ts-loader": "8.2.0",
"ts-loader": "8.3.0",
"ts-mocha": "8.0.0",
"typescript": "4.2.4",
"webpack": "4.46.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
},
"devDependencies": {
"@types/mocha": "7.0.2",
"@types/node": "14.14.45",
"@types/node": "14.17.0",
"codecov": "3.8.2",
"grpc": "1.24.9",
"grpc": "1.24.10",
"gts": "3.1.0",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"ts-loader": "8.2.0",
"ts-loader": "8.3.0",
"ts-mocha": "8.0.0",
"typescript": "4.2.4"
},
Expand Down
Loading

0 comments on commit 681aa0c

Please sign in to comment.