Skip to content

Commit

Permalink
Merge branch 'master' into feat/plugin-injection
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Cornelissen committed Nov 30, 2020
2 parents ea65888 + 6a55593 commit 18f468a
Show file tree
Hide file tree
Showing 44 changed files with 286 additions and 290 deletions.
2 changes: 1 addition & 1 deletion backwards-compatability/node10/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@opentelemetry/tracing": "^0.12.0"
},
"devDependencies": {
"@types/node": "10.17.28",
"@types/node": "10.17.48",
"typescript": "3.9.7"
},
"author": "OpenTelemetry Authors",
Expand Down
2 changes: 1 addition & 1 deletion backwards-compatability/node12/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@opentelemetry/tracing": "^0.12.0"
},
"devDependencies": {
"@types/node": "12.12.54",
"@types/node": "12.19.8",
"typescript": "3.9.7"
},
"author": "OpenTelemetry Authors",
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 @@ -12,7 +12,7 @@
"@opentelemetry/tracing": "^0.12.0"
},
"devDependencies": {
"@types/node": "8.10.62",
"@types/node": "8.10.66",
"typescript": "3.9.7"
},
"author": "OpenTelemetry Authors",
Expand Down
2 changes: 1 addition & 1 deletion getting-started/example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"dependencies": {
"axios": "^0.19.0",
"axios": "^0.21.0",
"express": "^4.17.1"
}
}
2 changes: 1 addition & 1 deletion getting-started/monitored-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@opentelemetry/exporter-prometheus": "^0.12.0",
"@opentelemetry/metrics": "^0.12.0",
"axios": "^0.19.0",
"axios": "^0.21.0",
"express": "^4.17.1"
}
}
4 changes: 2 additions & 2 deletions getting-started/traced-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"@opentelemetry/core": "^0.12.0",
"@opentelemetry/exporter-zipkin": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/plugin-express": "^0.10.0",
"@opentelemetry/plugin-express": "^0.11.0",
"@opentelemetry/plugin-http": "^0.12.0",
"@opentelemetry/plugin-https": "^0.12.0",
"@opentelemetry/tracing": "^0.12.0",
"axios": "^0.19.0",
"axios": "^0.21.0",
"express": "^4.17.1"
}
}
6 changes: 3 additions & 3 deletions getting-started/ts-example/example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"devDependencies": {
"@types/express": "4.17.7",
"@types/node": "14.0.27",
"@types/express": "4.17.9",
"@types/node": "14.14.10",
"ts-node": "8.10.2"
},
"dependencies": {
"axios": "^0.19.1",
"axios": "^0.21.0",
"express": "^4.17.1"
}
}
10 changes: 5 additions & 5 deletions getting-started/ts-example/monitored-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",
"devDependencies": {
"@types/express": "4.17.7",
"@types/node": "14.0.27",
"@types/express": "4.17.9",
"@types/node": "14.14.10",
"ts-node": "8.10.2"
},
"dependencies": {
"@opentelemetry/exporter-prometheus": "^0.11.0",
"@opentelemetry/metrics": "^0.11.0",
"axios": "^0.19.1",
"@opentelemetry/exporter-prometheus": "^0.12.0",
"@opentelemetry/metrics": "^0.12.0",
"axios": "^0.21.0",
"express": "^4.17.1"
}
}
20 changes: 10 additions & 10 deletions getting-started/ts-example/traced-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"devDependencies": {
"@types/express": "4.17.7",
"@types/node": "14.0.27",
"@types/express": "4.17.9",
"@types/node": "14.14.10",
"ts-node": "9.0.0"
},
"dependencies": {
"@opentelemetry/core": "^0.11.0",
"@opentelemetry/exporter-zipkin": "^0.11.0",
"@opentelemetry/node": "^0.11.0",
"@opentelemetry/plugin-express": "^0.10.0",
"@opentelemetry/plugin-http": "^0.11.0",
"@opentelemetry/plugin-https": "^0.11.0",
"@opentelemetry/tracing": "^0.11.0",
"axios": "^0.19.1",
"@opentelemetry/core": "^0.12.0",
"@opentelemetry/exporter-zipkin": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/plugin-express": "^0.11.0",
"@opentelemetry/plugin-http": "^0.12.0",
"@opentelemetry/plugin-https": "^0.12.0",
"@opentelemetry/tracing": "^0.12.0",
"axios": "^0.21.0",
"express": "^4.17.1"
}
}
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 @@ -12,7 +12,7 @@
"@opentelemetry/context-async-hooks": "^0.12.0",
"@opentelemetry/core": "^0.12.0",
"@opentelemetry/tracing": "^0.12.0",
"axios": "0.19.2",
"axios": "0.21.0",
"body-parser": "1.19.0",
"express": "4.17.1"
}
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@
"devDependencies": {
"@commitlint/cli": "11.0.0",
"@commitlint/config-conventional": "11.0.0",
"@typescript-eslint/eslint-plugin": "4.1.1",
"@typescript-eslint/parser": "4.1.1",
"@typescript-eslint/eslint-plugin": "4.9.0",
"@typescript-eslint/parser": "4.9.0",
"beautify-benchmark": "0.2.4",
"benchmark": "2.1.4",
"eslint": "7.6.0",
"eslint-config-airbnb-base": "14.2.0",
"eslint-plugin-header": "3.0.0",
"eslint-plugin-import": "2.22.0",
"eslint": "7.14.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-plugin-header": "3.1.0",
"eslint-plugin-import": "2.22.1",
"gh-pages": "3.1.0",
"gts": "2.0.2",
"husky": "4.2.5",
"husky": "4.3.0",
"lerna": "3.22.1",
"lerna-changelog": "1.0.1",
"markdownlint-cli": "0.23.2",
"markdownlint-cli": "0.25.0",
"typescript": "3.9.7"
},
"husky": {
Expand Down
22 changes: 11 additions & 11 deletions packages/opentelemetry-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,27 @@
"@opentelemetry/context-base": "^0.12.0"
},
"devDependencies": {
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"@types/sinon": "9.0.5",
"@types/webpack-env": "1.15.2",
"codecov": "3.7.2",
"@types/mocha": "8.0.4",
"@types/node": "14.14.10",
"@types/sinon": "9.0.9",
"@types/webpack-env": "1.16.0",
"codecov": "3.8.1",
"gts": "2.0.2",
"istanbul-instrumenter-loader": "3.0.1",
"karma": "5.1.1",
"karma": "5.2.3",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.32",
"karma-webpack": "4.0.2",
"linkinator": "2.1.1",
"linkinator": "2.4.0",
"mocha": "7.2.0",
"nyc": "15.1.0",
"sinon": "9.0.3",
"ts-loader": "8.0.2",
"sinon": "9.2.1",
"ts-loader": "8.0.11",
"ts-mocha": "7.0.0",
"typedoc": "0.18.0",
"typedoc": "0.19.2",
"typescript": "3.9.7",
"webpack": "4.44.1"
"webpack": "4.44.2"
}
}
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 @@ -42,10 +42,10 @@
"access": "public"
},
"devDependencies": {
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"@types/mocha": "8.0.4",
"@types/node": "14.14.10",
"@types/shimmer": "1.0.1",
"codecov": "3.7.2",
"codecov": "3.8.1",
"gts": "2.0.2",
"mocha": "7.2.0",
"nyc": "15.1.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/opentelemetry-context-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"access": "public"
},
"devDependencies": {
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"codecov": "3.7.2",
"@types/mocha": "8.0.4",
"@types/node": "14.14.10",
"codecov": "3.8.1",
"gts": "2.0.2",
"mocha": "7.2.0",
"nyc": "15.1.0",
Expand Down
28 changes: 14 additions & 14 deletions packages/opentelemetry-context-zone-peer-dep/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.11.1",
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"@types/sinon": "9.0.4",
"@types/webpack-env": "1.15.2",
"@babel/core": "7.12.9",
"@types/mocha": "8.0.4",
"@types/node": "14.14.10",
"@types/sinon": "9.0.9",
"@types/webpack-env": "1.16.0",
"@types/zone.js": "0.5.12",
"babel-loader": "8.1.0",
"codecov": "3.7.2",
"babel-loader": "8.2.2",
"codecov": "3.8.1",
"gts": "2.0.2",
"istanbul-instrumenter-loader": "3.0.1",
"karma": "5.1.1",
"karma": "5.2.3",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-mocha": "2.0.1",
Expand All @@ -61,20 +61,20 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.0.3",
"ts-loader": "8.0.2",
"sinon": "9.2.1",
"ts-loader": "8.0.11",
"ts-mocha": "7.0.0",
"ts-node": "9.0.0",
"typescript": "3.9.7",
"webpack": "4.44.1",
"webpack-cli": "4.1.0",
"zone.js": "0.10.3"
"webpack": "4.44.2",
"webpack-cli": "4.2.0",
"zone.js": "0.11.3"
},
"dependencies": {
"@opentelemetry/context-base": "^0.12.0"
},
"peerDependencies": {
"zone.js": "^0.10.2"
"zone.js": "^0.10.2 || ^0.11.0"
},
"sideEffects": false
}
28 changes: 14 additions & 14 deletions packages/opentelemetry-context-zone/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,34 +39,34 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.11.1",
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"@types/sinon": "9.0.4",
"@types/webpack-env": "1.15.2",
"babel-loader": "8.1.0",
"codecov": "3.7.2",
"@babel/core": "7.12.9",
"@types/mocha": "8.0.4",
"@types/node": "14.14.10",
"@types/sinon": "9.0.9",
"@types/webpack-env": "1.16.0",
"babel-loader": "8.2.2",
"codecov": "3.8.1",
"gts": "2.0.2",
"karma": "5.1.1",
"karma": "5.2.3",
"karma-chrome-launcher": "3.1.0",
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.32",
"karma-webpack": "4.0.2",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.0.3",
"ts-loader": "8.0.2",
"sinon": "9.2.1",
"ts-loader": "8.0.11",
"ts-mocha": "7.0.0",
"ts-node": "9.0.0",
"typescript": "3.9.7",
"webpack": "4.44.1",
"webpack-cli": "4.1.0",
"webpack-merge": "5.1.1"
"webpack": "4.44.2",
"webpack-cli": "4.2.0",
"webpack-merge": "5.4.0"
},
"dependencies": {
"@opentelemetry/context-zone-peer-dep": "^0.12.0",
"zone.js": "^0.10.2"
"zone.js": "^0.11.0"
},
"sideEffects": true
}
20 changes: 10 additions & 10 deletions packages/opentelemetry-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
},
"devDependencies": {
"@opentelemetry/propagator-b3": "^0.12.0",
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"@types/semver": "7.3.2",
"@types/sinon": "9.0.4",
"@types/webpack-env": "1.15.2",
"codecov": "3.7.2",
"@types/mocha": "8.0.4",
"@types/node": "14.14.10",
"@types/semver": "7.3.4",
"@types/sinon": "9.0.9",
"@types/webpack-env": "1.16.0",
"codecov": "3.8.1",
"gts": "2.0.2",
"istanbul-instrumenter-loader": "3.0.1",
"karma": "5.1.1",
"karma": "5.2.3",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-mocha": "2.0.1",
Expand All @@ -70,12 +70,12 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.0.3",
"ts-loader": "8.0.2",
"sinon": "9.2.1",
"ts-loader": "8.0.11",
"ts-mocha": "7.0.0",
"ts-node": "9.0.0",
"typescript": "3.9.7",
"webpack": "4.44.1"
"webpack": "4.44.2"
},
"dependencies": {
"@opentelemetry/api": "^0.12.0",
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 @@ -47,18 +47,18 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.11.1",
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"@types/sinon": "9.0.4",
"codecov": "3.7.2",
"@babel/core": "7.12.9",
"@types/mocha": "8.0.4",
"@types/node": "14.14.10",
"@types/sinon": "9.0.9",
"codecov": "3.8.1",
"cpx": "1.5.0",
"gts": "2.0.2",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.0.3",
"ts-loader": "8.0.2",
"sinon": "9.2.1",
"ts-loader": "8.0.11",
"ts-mocha": "7.0.0",
"ts-node": "9.0.0",
"typescript": "3.9.7"
Expand Down
Loading

0 comments on commit 18f468a

Please sign in to comment.