Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into api-rc
Browse files Browse the repository at this point in the history
  • Loading branch information
@dyladan
dyladan committed Mar 24, 2021
2 parents 145d87b + 24bcfe8 commit 8fe94e5
Show file tree
Hide file tree
Showing 43 changed files with 230 additions and 230 deletions.
4 changes: 2 additions & 2 deletions backwards-compatability/node10/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@opentelemetry/tracing": "^0.18.0"
},
"devDependencies": {
"@types/node": "10.17.50",
"typescript": "4.1.3"
"@types/node": "10.17.55",
"typescript": "4.2.3"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions backwards-compatability/node12/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@opentelemetry/tracing": "^0.18.0"
},
"devDependencies": {
"@types/node": "12.19.13",
"typescript": "4.1.3"
"@types/node": "12.20.6",
"typescript": "4.2.3"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion backwards-compatability/node8/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@types/node": "8.10.66",
"typescript": "4.1.3"
"typescript": "4.2.3"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0"
Expand Down
14 changes: 7 additions & 7 deletions getting-started/traced-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"dependencies": {
"@opentelemetry/core": "^0.14.0",
"@opentelemetry/exporter-zipkin": "^0.14.0",
"@opentelemetry/node": "^0.14.0",
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/plugin-express": "^0.12.1",
"@opentelemetry/plugin-http": "^0.14.0",
"@opentelemetry/plugin-https": "^0.14.0",
"@opentelemetry/tracing": "^0.14.0",
"@opentelemetry/plugin-express": "^0.14.0",
"@opentelemetry/plugin-http": "^0.18.0",
"@opentelemetry/plugin-https": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"axios": "^0.21.0",
"express": "^4.17.1"
}
Expand Down
2 changes: 1 addition & 1 deletion getting-started/ts-example/example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "Apache-2.0",
"devDependencies": {
"@types/express": "4.17.11",
"@types/node": "14.14.20",
"@types/node": "14.14.35",
"ts-node": "8.10.2"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion getting-started/ts-example/monitored-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "Apache-2.0",
"devDependencies": {
"@types/express": "4.17.11",
"@types/node": "14.14.20",
"@types/node": "14.14.35",
"ts-node": "8.10.2"
},
"dependencies": {
Expand Down
16 changes: 8 additions & 8 deletions getting-started/ts-example/traced-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
"license": "Apache-2.0",
"devDependencies": {
"@types/express": "4.17.11",
"@types/node": "14.14.20",
"@types/node": "14.14.35",
"ts-node": "9.1.1"
},
"dependencies": {
"@opentelemetry/core": "^0.14.0",
"@opentelemetry/exporter-zipkin": "^0.14.0",
"@opentelemetry/node": "^0.14.0",
"@opentelemetry/plugin-express": "^0.12.1",
"@opentelemetry/plugin-http": "^0.14.0",
"@opentelemetry/plugin-https": "^0.14.0",
"@opentelemetry/tracing": "^0.14.0",
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-express": "^0.14.0",
"@opentelemetry/plugin-http": "^0.18.0",
"@opentelemetry/plugin-https": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"axios": "^0.21.0",
"express": "^4.17.1"
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/propagation-validation-server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"express": "4.17.1"
},
"devDependencies": {
"typescript": "4.1.3"
"typescript": "4.2.3"
}
}
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
"devDependencies": {
"@commitlint/cli": "11.0.0",
"@commitlint/config-conventional": "11.0.0",
"@typescript-eslint/eslint-plugin": "4.16.1",
"@typescript-eslint/parser": "4.16.1",
"@typescript-eslint/eslint-plugin": "4.19.0",
"@typescript-eslint/parser": "4.19.0",
"beautify-benchmark": "0.2.4",
"benchmark": "2.1.4",
"eslint": "7.21.0",
"eslint": "7.22.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.22.1",
Expand All @@ -60,8 +60,8 @@
"husky": "4.3.8",
"lerna": "3.22.1",
"lerna-changelog": "1.0.1",
"markdownlint-cli": "0.26.0",
"typescript": "4.1.3",
"markdownlint-cli": "0.27.1",
"typescript": "4.2.3",
"update-ts-references": "2.0.0"
},
"husky": {
Expand Down
10 changes: 5 additions & 5 deletions packages/opentelemetry-api-metrics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"@opentelemetry/api": "^1.0.0-rc.0"
},
"devDependencies": {
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/mocha": "8.2.2",
"@types/node": "14.14.35",
"@types/webpack-env": "1.16.0",
"codecov": "3.8.1",
"gts": "3.1.0",
Expand All @@ -65,9 +65,9 @@
"karma-webpack": "4.0.2",
"mocha": "7.2.0",
"nyc": "15.1.0",
"ts-loader": "8.0.12",
"ts-loader": "8.0.18",
"ts-mocha": "8.0.0",
"typescript": "4.1.3",
"webpack": "4.44.2"
"typescript": "4.2.3",
"webpack": "4.46.0"
}
}
6 changes: 3 additions & 3 deletions packages/opentelemetry-context-async-hooks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"access": "public"
},
"devDependencies": {
"@types/mocha": "8.2.0",
"@types/node": "14.14.20",
"@types/mocha": "8.2.2",
"@types/node": "14.14.35",
"@types/shimmer": "1.0.1",
"codecov": "3.8.1",
"gts": "3.1.0",
Expand All @@ -50,7 +50,7 @@
"rimraf": "3.0.2",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.1.3"
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0-rc.0"
Expand Down
18 changes: 9 additions & 9 deletions packages/opentelemetry-context-zone-peer-dep/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.12.10",
"@types/mocha": "8.2.0",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@babel/core": "7.13.10",
"@types/mocha": "8.2.2",
"@types/node": "14.14.35",
"@types/sinon": "9.0.11",
"@types/webpack-env": "1.16.0",
"@types/zone.js": "0.5.12",
"babel-loader": "8.2.2",
Expand All @@ -60,14 +60,14 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"sinon": "9.2.4",
"ts-loader": "8.0.18",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.1.3",
"typescript": "4.2.3",
"webpack": "4.46.0",
"webpack-cli": "4.3.1",
"zone.js": "0.11.3"
"webpack-cli": "4.5.0",
"zone.js": "0.11.4"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0-rc.0"
Expand Down
16 changes: 8 additions & 8 deletions packages/opentelemetry-context-zone/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.12.10",
"@types/mocha": "8.2.0",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@babel/core": "7.13.10",
"@types/mocha": "8.2.2",
"@types/node": "14.14.35",
"@types/sinon": "9.0.11",
"@types/webpack-env": "1.16.0",
"babel-loader": "8.2.2",
"codecov": "3.8.1",
Expand All @@ -54,13 +54,13 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"sinon": "9.2.4",
"ts-loader": "8.0.18",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.1.3",
"typescript": "4.2.3",
"webpack": "4.46.0",
"webpack-cli": "4.3.1",
"webpack-cli": "4.5.0",
"webpack-merge": "5.7.3"
},
"dependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/opentelemetry-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
},
"devDependencies": {
"@opentelemetry/propagator-b3": "^0.18.0",
"@types/mocha": "8.2.0",
"@types/node": "14.14.20",
"@types/mocha": "8.2.2",
"@types/node": "14.14.35",
"@types/semver": "7.3.4",
"@types/sinon": "9.0.10",
"@types/sinon": "9.0.11",
"@types/webpack-env": "1.16.0",
"codecov": "3.8.1",
"gts": "3.1.0",
Expand All @@ -68,11 +68,11 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"sinon": "9.2.4",
"ts-loader": "8.0.18",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.1.3",
"typescript": "4.2.3",
"webpack": "4.46.0"
},
"dependencies": {
Expand Down
14 changes: 7 additions & 7 deletions packages/opentelemetry-exporter-collector-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,22 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.12.10",
"@babel/core": "7.13.10",
"@opentelemetry/api-metrics": "^0.18.0",
"@types/mocha": "8.2.0",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@types/mocha": "8.2.2",
"@types/node": "14.14.35",
"@types/sinon": "9.0.11",
"codecov": "3.8.1",
"cpx": "1.5.0",
"gts": "3.1.0",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"sinon": "9.2.4",
"ts-loader": "8.0.18",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.1.3"
"typescript": "4.2.3"
},
"dependencies": {
"@grpc/proto-loader": "^0.5.4",
Expand Down
14 changes: 7 additions & 7 deletions packages/opentelemetry-exporter-collector-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,22 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.12.10",
"@babel/core": "7.13.10",
"@opentelemetry/api-metrics": "^0.18.0",
"@types/mocha": "8.2.0",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@types/mocha": "8.2.2",
"@types/node": "14.14.35",
"@types/sinon": "9.0.11",
"codecov": "3.8.1",
"cpx": "1.5.0",
"gts": "3.1.0",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"sinon": "9.2.4",
"ts-loader": "8.0.18",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.1.3"
"typescript": "4.2.3"
},
"dependencies": {
"@grpc/proto-loader": "^0.5.4",
Expand Down
16 changes: 8 additions & 8 deletions packages/opentelemetry-exporter-collector/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.12.10",
"@types/mocha": "8.2.0",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@babel/core": "7.13.10",
"@types/mocha": "8.2.2",
"@types/node": "14.14.35",
"@types/sinon": "9.0.11",
"@types/webpack-env": "1.16.0",
"babel-loader": "8.2.2",
"codecov": "3.8.1",
Expand All @@ -67,13 +67,13 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"sinon": "9.2.4",
"ts-loader": "8.0.18",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.1.3",
"typescript": "4.2.3",
"webpack": "4.46.0",
"webpack-cli": "4.3.1",
"webpack-cli": "4.5.0",
"webpack-merge": "5.7.3"
},
"dependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/opentelemetry-exporter-jaeger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@
},
"devDependencies": {
"@opentelemetry/resources": "^0.18.0",
"@types/mocha": "8.2.0",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@types/mocha": "8.2.2",
"@types/node": "14.14.35",
"@types/sinon": "9.0.11",
"codecov": "3.8.1",
"gts": "3.1.0",
"mocha": "7.2.0",
"nock": "12.0.3",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.3",
"sinon": "9.2.4",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.1.3"
"typescript": "4.2.3"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0-rc.0",
Expand Down
Loading

0 comments on commit 8fe94e5

Please sign in to comment.