Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into typescript-4_gts-3
Browse files Browse the repository at this point in the history
  • Loading branch information
@Flarna
Flarna committed Feb 9, 2021
2 parents 5e75b24 + b13740d commit f8dfdaf
Show file tree
Hide file tree
Showing 19 changed files with 49 additions and 49 deletions.
4 changes: 2 additions & 2 deletions detectors/node/opentelemetry-resource-detector-github/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/core": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/core": "0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/mocha": "8.0.1",
"@types/node": "14.0.27",
"@types/sinon": "9.0.4",
Expand Down
2 changes: 1 addition & 1 deletion metapackages/plugins-node-core-and-contrib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"@opentelemetry/plugin-pg": "^0.13.0",
"@opentelemetry/plugin-pg-pool": "^0.13.0",
"@opentelemetry/plugin-redis": "^0.13.0",
"@opentelemetry/plugins-node-core": "^0.15.0"
"@opentelemetry/plugins-node-core": "0.15.0"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-host-metrics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/exporter-prometheus": "^0.15.0",
"@opentelemetry/exporter-prometheus": "0.15.0",
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"@types/sinon": "9.0.4",
Expand Down
6 changes: 3 additions & 3 deletions packages/opentelemetry-test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"typescript": "4.1.3"
},
"dependencies": {
"@opentelemetry/api": "^0.15.0",
"@opentelemetry/core": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0"
"@opentelemetry/api": "0.15.0",
"@opentelemetry/core": "0.15.0",
"@opentelemetry/tracing": "0.15.0"
}
}
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-hapi-instrumentation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
},
"devDependencies": {
"@hapi/hapi": "20.0.1",
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/hapi__hapi": "20.0.1",
"@types/mocha": "7.0.2",
"@types/node": "12.12.47",
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-instrumentation-dns/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/core": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/core": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
"@types/semver": "7.3.1",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/graphql": "14.5.0",
"@types/mocha": "8.0.1",
"@types/node": "14.0.27",
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-instrumentation-ioredis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/test-utils": "^0.13.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/ioredis": "4.17.3",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-koa-instrumentation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
},
"devDependencies": {
"@koa/router": "9.4.0",
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/koa": "2.11.4",
"@types/koa__router": "8.0.2",
"@types/mocha": "7.0.2",
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-plugin-dns/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
"@types/semver": "7.3.1",
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-plugin-express/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/express": "4.17.7",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-plugin-ioredis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/test-utils": "^0.13.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/ioredis": "4.17.3",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-plugin-mongodb/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/mocha": "7.0.2",
"@types/mongodb": "3.5.25",
"@types/node": "14.0.27",
Expand Down
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-plugin-mysql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/semantic-conventions": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/semantic-conventions": "0.15.0",
"@opentelemetry/test-utils": "^0.13.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/mocha": "7.0.2",
"@types/mysql": "2.15.15",
"@types/node": "14.0.27",
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-plugin-pg-pool/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/plugin-pg": "^0.13.0",
"@opentelemetry/test-utils": "^0.13.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
"@types/pg": "7.14.4",
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-plugin-pg/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/test-utils": "^0.13.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
"@types/pg": "7.14.4",
Expand Down
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-plugin-redis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.15.0",
"@opentelemetry/node": "^0.15.0",
"@opentelemetry/semantic-conventions": "^0.15.0",
"@opentelemetry/context-async-hooks": "0.15.0",
"@opentelemetry/node": "0.15.0",
"@opentelemetry/semantic-conventions": "0.15.0",
"@opentelemetry/test-utils": "^0.13.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
"@types/redis": "2.8.25",
Expand Down
8 changes: 4 additions & 4 deletions plugins/web/opentelemetry-instrumentation-user-interaction/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
},
"devDependencies": {
"@babel/core": "7.11.1",
"@opentelemetry/context-base": "^0.15.0",
"@opentelemetry/context-zone-peer-dep": "^0.15.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.15.0",
"@opentelemetry/tracing": "^0.15.0",
"@opentelemetry/context-base": "0.15.0",
"@opentelemetry/context-zone-peer-dep": "0.15.0",
"@opentelemetry/instrumentation-xml-http-request": "0.15.0",
"@opentelemetry/tracing": "0.15.0",
"@types/jquery": "3.5.1",
"@types/mocha": "7.0.2",
"@types/node": "14.0.27",
Expand Down
2 changes: 1 addition & 1 deletion plugins/web/opentelemetry-plugin-react-load/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@babel/core": "7.10.2",
"@opentelemetry/propagator-b3": "^0.15.0",
"@opentelemetry/propagator-b3": "0.15.0",
"@types/mocha": "7.0.2",
"@types/node": "12.12.47",
"@types/react": "16.9.46",
Expand Down

0 comments on commit f8dfdaf

Please sign in to comment.