Skip to content

Commit

Permalink
Merge branch 'main' into rm-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@dyladan
dyladan authored Jul 1, 2021
2 parents 2054368 + 0d86e42 commit e5857fc
Show file tree
Hide file tree
Showing 59 changed files with 478 additions and 332 deletions.
6 changes: 3 additions & 3 deletions detectors/node/opentelemetry-resource-detector-github/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
"access": "public"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
"@opentelemetry/api": "^1.0.1"
},
"devDependencies": {
"@opentelemetry/api": "1.0.0",
"@opentelemetry/api": "1.0.1",
"@types/mocha": "8.2.2",
"@types/node": "14.17.3",
"@types/sinon": "10.0.2",
Expand All @@ -60,6 +60,6 @@
"typescript": "4.3.2"
},
"dependencies": {
"@opentelemetry/resources": "^0.22.0"
"@opentelemetry/resources": "^0.23.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": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-dns": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0"
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.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": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-express": "^0.15.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"axios": "^0.21.1",
"cross-env": "^7.0.3",
"express": "^4.17.1"
Expand Down
10 changes: 5 additions & 5 deletions examples/graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/exporter-collector": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/exporter-collector": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-graphql": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/instrumentation-express": "^0.15.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/tracing": "^0.23.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 @@ -34,13 +34,13 @@
"@opencensus/instrumentation-grpc": "0.0.21",
"@opencensus/nodejs": "0.0.21",
"@opencensus/propagation-binaryformat": "0.0.21",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/core": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/instrumentation-grpc": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/core": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-grpc": "^0.23.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/propagator-grpc-census-binary": "^0.15.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/tracing": "^0.23.0",
"grpc": "^1.24.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc_dynamic_codegen/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.4.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/instrumentation-grpc": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/instrumentation-grpc": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"grpc": "^1.24.6"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
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": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-hapi": "^0.15.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"axios": "^0.21.1"
},
"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": "^1.0.0",
"@opentelemetry/core": "^0.22.0",
"@opentelemetry/exporter-collector": "^0.22.0",
"@opentelemetry/exporter-prometheus": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/core": "^0.23.0",
"@opentelemetry/exporter-collector": "^0.23.0",
"@opentelemetry/exporter-prometheus": "^0.23.0",
"@opentelemetry/host-metrics": "^0.15.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/metrics": "^0.22.0"
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/metrics": "^0.23.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": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-ioredis": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.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": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/instrumentation-koa": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"axios": "^0.21.1",
"koa": "^2.13.0"
},
Expand Down
6 changes: 3 additions & 3 deletions examples/memcached/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-memcached": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"memcached": "^2.2.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
Expand Down
10 changes: 5 additions & 5 deletions examples/meta-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
"eslint": "^7.4.0"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/auto-instrumentations-node": "^0.15.0",
"@opentelemetry/exporter-collector": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/exporter-collector": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"axios": "^0.21.1",
"express": "^4.17.1"
}
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": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/instrumentation-mongodb": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.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": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/instrumentation-mysql": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"mysql": "*"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
14 changes: 7 additions & 7 deletions examples/network/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-net": "file:../../plugins/node/opentelemetry-instrumentation-net",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/instrumentation-dns": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0"
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"devDependencies": {
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": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/instrumentation-pg": "^0.16.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"express": "^4.17.1",
"pg": "^8.6.0"
},
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.22.0",
"@opentelemetry/exporter-collector": "^0.22.0",
"@opentelemetry/context-zone": "^0.23.0",
"@opentelemetry/exporter-collector": "^0.23.0",
"@opentelemetry/plugin-react-load": "^0.15.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/web": "^0.22.0",
"@opentelemetry/tracing": "^0.23.0",
"@opentelemetry/web": "^0.23.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.22.0",
"@opentelemetry/core": "^0.22.0",
"@opentelemetry/exporter-collector": "^0.22.0",
"@opentelemetry/context-zone": "^0.23.0",
"@opentelemetry/core": "^0.23.0",
"@opentelemetry/exporter-collector": "^0.23.0",
"@opentelemetry/plugin-react-load": "^0.15.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/web": "^0.22.0",
"@opentelemetry/tracing": "^0.23.0",
"@opentelemetry/web": "^0.23.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": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^0.22.0",
"@opentelemetry/exporter-zipkin": "^0.22.0",
"@opentelemetry/instrumentation": "^0.22.0",
"@opentelemetry/instrumentation-http": "^0.22.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.23.0",
"@opentelemetry/exporter-zipkin": "^0.23.0",
"@opentelemetry/instrumentation": "^0.23.0",
"@opentelemetry/instrumentation-http": "^0.23.0",
"@opentelemetry/instrumentation-redis": "^0.15.0",
"@opentelemetry/node": "^0.22.0",
"@opentelemetry/tracing": "^0.22.0",
"@opentelemetry/node": "^0.23.0",
"@opentelemetry/tracing": "^0.23.0",
"axios": "^0.21.1",
"express": "^4.17.1",
"redis": "^2.8.0"
Expand Down
Loading

0 comments on commit e5857fc

Please sign in to comment.