Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
Browse files Browse the repository at this point in the history 
…y-js-contrib into ioredis-require-parent-span
  • Loading branch information
Amir Blum committed Mar 4, 2021
2 parents 245efa3 + e3c1359 commit 310e21a
Show file tree
Hide file tree
Showing 41 changed files with 214 additions and 216 deletions.
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-github/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@
"typescript": "4.1.3"
},
"dependencies": {
"@opentelemetry/resources": "^0.17.0"
"@opentelemetry/resources": "^0.18.0"
}
}
12 changes: 6 additions & 6 deletions examples/dns/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/instrumentation-dns": "^0.13.1",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0"
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"devDependencies": {
Expand Down
14 changes: 7 additions & 7 deletions examples/express/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-express": "file:../../plugins/node/opentelemetry-plugin-express",
"@opentelemetry/plugin-http": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/plugin-http": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"axios": "^0.19.0",
"express": "^4.17.1"
},
Expand Down
14 changes: 7 additions & 7 deletions examples/graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-collector": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-collector": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/instrumentation-graphql": "^0.13.1",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-express": "^0.13.1",
"@opentelemetry/plugin-http": "^0.17.0",
"@opentelemetry/plugin-https": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/plugin-http": "^0.18.0",
"@opentelemetry/plugin-https": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"apollo-server": "^2.18.1",
"express": "^4.17.1",
"express-graphql": "^0.11.0",
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc-census-prop/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
"dependencies": {
"@grpc/proto-loader": "^0.4.0",
"@opencensus/core": "0.0.21",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opencensus/instrumentation-grpc": "0.0.21",
"@opencensus/nodejs": "0.0.21",
"@opencensus/propagation-binaryformat": "0.0.21",
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/core": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-grpc": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-grpc": "^0.18.0",
"@opentelemetry/propagator-grpc-census-binary": "^0.13.1",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/tracing": "^0.18.0",
"grpc": "^1.24.2",
"node-pre-gyp": "0.12.0"
},
Expand Down
14 changes: 7 additions & 7 deletions examples/hapi/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
},
"dependencies": {
"@hapi/hapi": "^19.2.0",
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/hapi-instrumentation": "^0.13.1",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-http": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-http": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"axios": "^0.19.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down
12 changes: 6 additions & 6 deletions examples/host-metrics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/core": "^0.17.0",
"@opentelemetry/exporter-collector": "^0.17.0",
"@opentelemetry/exporter-prometheus": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/exporter-collector": "^0.18.0",
"@opentelemetry/exporter-prometheus": "^0.18.0",
"@opentelemetry/host-metrics": "^0.13.1",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/metrics": "^0.17.0"
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/metrics": "^0.18.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
10 changes: 5 additions & 5 deletions examples/ioredis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/instrumentation-ioredis": "^0.13.1",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"ioredis": "^4.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
Expand Down
14 changes: 7 additions & 7 deletions examples/koa/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
},
"dependencies": {
"@koa/router": "^9.3.1",
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/instrumentation-http": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/instrumentation-http": "^0.18.0",
"@opentelemetry/instrumentation-koa": "^0.13.1",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"axios": "^0.19.0",
"koa": "^2.13.0"
},
Expand Down
14 changes: 7 additions & 7 deletions examples/mongodb/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/instrumentation-http": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/instrumentation-http": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-mongodb": "^0.13.1",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/tracing": "^0.18.0",
"mongodb": "^3.5.7"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down
14 changes: 7 additions & 7 deletions examples/mysql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-http": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-http": "^0.18.0",
"@opentelemetry/plugin-mysql": "^0.13.1",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/tracing": "^0.18.0",
"mysql": "*"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
14 changes: 7 additions & 7 deletions examples/postgres/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/instrumentation-http": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/instrumentation-http": "^0.18.0",
"@opentelemetry/instrumentation-pg": "^0.13.1",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/tracing": "^0.18.0",
"express": "^4.17.1",
"pg": "^7.12.1"
},
Expand Down
8 changes: 4 additions & 4 deletions examples/react-load/preact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
"sirv-cli": "1.0.3"
},
"dependencies": {
"@opentelemetry/context-zone": "^0.17.0",
"@opentelemetry/exporter-collector": "^0.17.0",
"@opentelemetry/context-zone": "^0.18.0",
"@opentelemetry/exporter-collector": "^0.18.0",
"@opentelemetry/plugin-react-load": "^0.11.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/web": "^0.17.0",
"@opentelemetry/tracing": "^0.18.0",
"@opentelemetry/web": "^0.18.0",
"preact": "^10.3.2",
"preact-render-to-string": "^5.1.4",
"preact-router": "^3.2.1"
Expand Down
10 changes: 5 additions & 5 deletions examples/react-load/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
"ts-loader": "^6.0.4"
},
"dependencies": {
"@opentelemetry/context-zone": "^0.17.0",
"@opentelemetry/core": "^0.17.0",
"@opentelemetry/exporter-collector": "^0.17.0",
"@opentelemetry/context-zone": "^0.18.0",
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/exporter-collector": "^0.18.0",
"@opentelemetry/plugin-react-load": "^0.11.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/web": "^0.17.0",
"@opentelemetry/tracing": "^0.18.0",
"@opentelemetry/web": "^0.18.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.2.0",
Expand Down
14 changes: 7 additions & 7 deletions examples/redis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/exporter-jaeger": "^0.17.0",
"@opentelemetry/exporter-zipkin": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/node": "^0.17.0",
"@opentelemetry/plugin-http": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/exporter-jaeger": "^0.18.0",
"@opentelemetry/exporter-zipkin": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/node": "^0.18.0",
"@opentelemetry/plugin-http": "^0.18.0",
"@opentelemetry/plugin-redis": "^0.13.1",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/tracing": "^0.18.0",
"axios": "^0.19.0",
"express": "^4.17.1",
"redis": "^2.8.0"
Expand Down
16 changes: 8 additions & 8 deletions examples/web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"@opentelemetry/context-zone": "^0.17.0",
"@opentelemetry/core": "^0.17.0",
"@opentelemetry/exporter-collector": "^0.17.0",
"@opentelemetry/instrumentation": "^0.17.0",
"@opentelemetry/context-zone": "^0.18.0",
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/exporter-collector": "^0.18.0",
"@opentelemetry/instrumentation": "^0.18.0",
"@opentelemetry/instrumentation-document-load": "^0.13.1",
"@opentelemetry/instrumentation-xml-http-request": "^0.17.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.18.0",
"@opentelemetry/instrumentation-user-interaction": "^0.13.1",
"@opentelemetry/propagator-b3": "^0.17.0",
"@opentelemetry/tracing": "^0.17.0",
"@opentelemetry/web": "^0.17.0"
"@opentelemetry/propagator-b3": "^0.18.0",
"@opentelemetry/tracing": "^0.18.0",
"@opentelemetry/web": "^0.18.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
}
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.1",
"@opentelemetry/plugin-pg-pool": "^0.13.1",
"@opentelemetry/plugin-redis": "^0.13.1",
"@opentelemetry/plugins-node-core": "0.17.0"
"@opentelemetry/plugins-node-core": "0.18.0"
}
}
10 changes: 5 additions & 5 deletions 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.17.0",
"@opentelemetry/exporter-prometheus": "0.18.0",
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"@types/sinon": "9.0.4",
Expand All @@ -61,10 +61,10 @@
"typescript": "4.1.3"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/api-metrics": "^0.17.0",
"@opentelemetry/core": "^0.17.0",
"@opentelemetry/metrics": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/api-metrics": "^0.18.0",
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/metrics": "^0.18.0",
"systeminformation": "^4.31.0"
}
}
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.17.0",
"@opentelemetry/core": "0.17.0",
"@opentelemetry/tracing": "0.17.0"
"@opentelemetry/api": "0.18.0",
"@opentelemetry/core": "0.18.0",
"@opentelemetry/tracing": "0.18.0"
}
}
12 changes: 6 additions & 6 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.17.0",
"@opentelemetry/node": "0.17.0",
"@opentelemetry/tracing": "0.17.0",
"@opentelemetry/context-async-hooks": "0.18.0",
"@opentelemetry/node": "0.18.0",
"@opentelemetry/tracing": "0.18.0",
"@types/hapi__hapi": "20.0.1",
"@types/mocha": "7.0.2",
"@types/node": "12.12.47",
Expand All @@ -62,9 +62,9 @@
"typescript": "4.1.3"
},
"dependencies": {
"@opentelemetry/api": "^0.17.0",
"@opentelemetry/core": "^0.17.0",
"@opentelemetry/semantic-conventions": "^0.17.0",
"@opentelemetry/api": "^0.18.0",
"@opentelemetry/core": "^0.18.0",
"@opentelemetry/semantic-conventions": "^0.18.0",
"shimmer": "^1.2.1"
}
}
Loading

0 comments on commit 310e21a

Please sign in to comment.