From 118def05cf35389adadf5e5020bd3f6a70723f6c Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Wed, 9 Jun 2021 11:36:09 -0400 Subject: [PATCH 1/4] chore: update core and api to 0.21.0 --- .../package.json | 6 ++-- examples/dns/package.json | 12 ++++---- examples/express/package.json | 14 +++++----- examples/graphql/package.json | 10 +++---- examples/grpc-census-prop/package.json | 12 ++++---- examples/grpc_dynamic_codegen/package.json | 12 ++++---- examples/hapi/package.json | 14 +++++----- examples/host-metrics/package.json | 12 ++++---- examples/ioredis/package.json | 10 +++---- examples/koa/package.json | 14 +++++----- examples/meta-node/package.json | 10 +++---- examples/mongodb/package.json | 14 +++++----- examples/mysql/package.json | 14 +++++----- examples/network/package.json | 14 +++++----- examples/postgres/package.json | 14 +++++----- examples/react-load/preact/package.json | 8 +++--- examples/react-load/react/package.json | 10 +++---- examples/redis/package.json | 14 +++++----- examples/restify/package.json | 14 +++++----- examples/router/package.json | 14 +++++----- examples/web/package.json | 18 ++++++------ .../auto-instrumentations-node/package.json | 28 +++++++++---------- .../auto-instrumentations-web/package.json | 14 +++++----- .../opentelemetry-host-metrics/package.json | 10 +++---- .../package.json | 6 ++-- .../opentelemetry-test-utils/package.json | 8 +++--- .../package.json | 18 ++++++------ .../package.json | 12 ++++---- .../package.json | 14 +++++----- .../package.json | 16 +++++------ .../package.json | 14 +++++----- .../package.json | 8 +++--- .../package.json | 14 +++++----- .../package.json | 16 +++++------ .../package.json | 14 +++++----- .../package.json | 16 +++++------ .../package.json | 14 +++++----- .../package.json | 14 +++++----- .../package.json | 12 ++++---- .../package.json | 16 +++++------ .../package.json | 12 ++++---- .../package.json | 16 +++++------ .../package.json | 16 +++++------ .../package.json | 14 +++++----- .../package.json | 12 ++++---- .../package.json | 14 +++++----- .../package.json | 16 +++++------ .../package.json | 16 +++++------ .../package.json | 6 ++-- .../package.json | 4 +-- .../package.json | 4 +-- 51 files changed, 327 insertions(+), 327 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 0f20874e11..c6572be0aa 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -43,10 +43,10 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/mocha": "8.2.2", "@types/node": "14.17.2", "@types/sinon": "10.0.2", @@ -60,6 +60,6 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/resources": "^0.20.0" + "@opentelemetry/resources": "^0.21.0" } } diff --git a/examples/dns/package.json b/examples/dns/package.json index 90058ac28a..04842e386c 100644 --- a/examples/dns/package.json +++ b/examples/dns/package.json @@ -26,13 +26,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", "@opentelemetry/instrumentation-dns": "^0.15.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0" + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "devDependencies": { diff --git a/examples/express/package.json b/examples/express/package.json index 7f38c7e440..8d74c5f2b4 100644 --- a/examples/express/package.json +++ b/examples/express/package.json @@ -28,14 +28,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", "@opentelemetry/instrumentation-express": "^0.15.0", - "@opentelemetry/instrumentation-http": "^0.20.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/instrumentation-http": "^0.21.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "axios": "^0.21.1", "cross-env": "^7.0.3", "express": "^4.17.1" diff --git a/examples/graphql/package.json b/examples/graphql/package.json index ce7133e466..a8982b0ae5 100644 --- a/examples/graphql/package.json +++ b/examples/graphql/package.json @@ -31,13 +31,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/exporter-collector": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/exporter-collector": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", "@opentelemetry/instrumentation-graphql": "^0.15.0", - "@opentelemetry/node": "^0.20.0", + "@opentelemetry/node": "^0.21.0", "@opentelemetry/instrumentation-express": "^0.15.0", - "@opentelemetry/instrumentation-http": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/instrumentation-http": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "apollo-server": "^2.18.1", "express": "^4.17.1", "express-graphql": "^0.11.0", diff --git a/examples/grpc-census-prop/package.json b/examples/grpc-census-prop/package.json index 695373d812..ba710b307b 100644 --- a/examples/grpc-census-prop/package.json +++ b/examples/grpc-census-prop/package.json @@ -34,13 +34,13 @@ "@opencensus/instrumentation-grpc": "0.0.21", "@opencensus/nodejs": "0.0.21", "@opencensus/propagation-binaryformat": "0.0.21", - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-grpc": "^0.20.0", - "@opentelemetry/node": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-grpc": "^0.21.0", + "@opentelemetry/node": "^0.21.0", "@opentelemetry/propagator-grpc-census-binary": "^0.15.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/tracing": "^0.21.0", "grpc": "^1.24.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/grpc_dynamic_codegen/package.json b/examples/grpc_dynamic_codegen/package.json index b559f28def..5762f2e2eb 100644 --- a/examples/grpc_dynamic_codegen/package.json +++ b/examples/grpc_dynamic_codegen/package.json @@ -28,12 +28,12 @@ }, "dependencies": { "@grpc/proto-loader": "^0.4.0", - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/instrumentation-grpc": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/instrumentation-grpc": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "grpc": "^1.24.6" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/hapi/package.json b/examples/hapi/package.json index 686a6192f5..cf1004fdc7 100644 --- a/examples/hapi/package.json +++ b/examples/hapi/package.json @@ -32,14 +32,14 @@ }, "dependencies": { "@hapi/hapi": "^19.2.0", - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", "@opentelemetry/instrumentation-hapi": "^0.15.0", - "@opentelemetry/instrumentation-http": "^0.20.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/instrumentation-http": "^0.21.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "axios": "^0.21.1" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", diff --git a/examples/host-metrics/package.json b/examples/host-metrics/package.json index 57620a5cfd..620b5a5205 100644 --- a/examples/host-metrics/package.json +++ b/examples/host-metrics/package.json @@ -26,13 +26,13 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/exporter-collector": "^0.20.0", - "@opentelemetry/exporter-prometheus": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/exporter-collector": "^0.21.0", + "@opentelemetry/exporter-prometheus": "^0.21.0", "@opentelemetry/host-metrics": "^0.15.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/metrics": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/metrics": "^0.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme" } diff --git a/examples/ioredis/package.json b/examples/ioredis/package.json index 0d0dab0be6..7f69c8e686 100644 --- a/examples/ioredis/package.json +++ b/examples/ioredis/package.json @@ -28,12 +28,12 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", "@opentelemetry/instrumentation-ioredis": "^0.15.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "ioredis": "^4.22.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme" diff --git a/examples/koa/package.json b/examples/koa/package.json index 8bcc215491..7270bba1bb 100644 --- a/examples/koa/package.json +++ b/examples/koa/package.json @@ -32,14 +32,14 @@ }, "dependencies": { "@koa/router": "^9.3.1", - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-http": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", "@opentelemetry/instrumentation-koa": "^0.15.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "axios": "^0.21.1", "koa": "^2.13.0" }, diff --git a/examples/meta-node/package.json b/examples/meta-node/package.json index 85857107d9..01fac4275a 100644 --- a/examples/meta-node/package.json +++ b/examples/meta-node/package.json @@ -35,12 +35,12 @@ "eslint": "^7.4.0" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", + "@opentelemetry/api": "^0.21.0", "@opentelemetry/auto-instrumentations-node": "^0.15.0", - "@opentelemetry/exporter-collector": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/exporter-collector": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "axios": "^0.21.1", "express": "^4.17.1" } diff --git a/examples/mongodb/package.json b/examples/mongodb/package.json index 347cd14aa2..8db69530aa 100644 --- a/examples/mongodb/package.json +++ b/examples/mongodb/package.json @@ -28,14 +28,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-http": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", "@opentelemetry/instrumentation-mongodb": "^0.15.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "mongodb": "^3.5.7" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", diff --git a/examples/mysql/package.json b/examples/mysql/package.json index 0ca199c9c7..20961bb914 100644 --- a/examples/mysql/package.json +++ b/examples/mysql/package.json @@ -28,14 +28,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-http": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", "@opentelemetry/instrumentation-mysql": "^0.15.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "mysql": "*" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/network/package.json b/examples/network/package.json index d8c1ee26a6..cd76f6c367 100644 --- a/examples/network/package.json +++ b/examples/network/package.json @@ -27,15 +27,15 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", "@opentelemetry/instrumentation-net": "file:../../plugins/node/opentelemetry-instrumentation-net", - "@opentelemetry/instrumentation-http": "^0.20.0", + "@opentelemetry/instrumentation-http": "^0.21.0", "@opentelemetry/instrumentation-dns": "^0.15.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0" + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", "devDependencies": { diff --git a/examples/postgres/package.json b/examples/postgres/package.json index 36dfe5bd1e..c3368fa6ac 100644 --- a/examples/postgres/package.json +++ b/examples/postgres/package.json @@ -30,14 +30,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-http": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", "@opentelemetry/instrumentation-pg": "^0.16.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "express": "^4.17.1", "pg": "^8.6.0" }, diff --git a/examples/react-load/preact/package.json b/examples/react-load/preact/package.json index 8d2cb06ec0..1ea1d03c4d 100644 --- a/examples/react-load/preact/package.json +++ b/examples/react-load/preact/package.json @@ -37,11 +37,11 @@ "sirv-cli": "1.0.3" }, "dependencies": { - "@opentelemetry/context-zone": "^0.20.0", - "@opentelemetry/exporter-collector": "^0.20.0", + "@opentelemetry/context-zone": "^0.21.0", + "@opentelemetry/exporter-collector": "^0.21.0", "@opentelemetry/plugin-react-load": "^0.15.0", - "@opentelemetry/tracing": "^0.20.0", - "@opentelemetry/web": "^0.20.0", + "@opentelemetry/tracing": "^0.21.0", + "@opentelemetry/web": "^0.21.0", "preact": "^10.3.2", "preact-render-to-string": "^5.1.4", "preact-router": "^3.2.1" diff --git a/examples/react-load/react/package.json b/examples/react-load/react/package.json index 06080bae92..26a3eb06d3 100644 --- a/examples/react-load/react/package.json +++ b/examples/react-load/react/package.json @@ -36,12 +36,12 @@ "ts-loader": "^6.0.4" }, "dependencies": { - "@opentelemetry/context-zone": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/exporter-collector": "^0.20.0", + "@opentelemetry/context-zone": "^0.21.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/exporter-collector": "^0.21.0", "@opentelemetry/plugin-react-load": "^0.15.0", - "@opentelemetry/tracing": "^0.20.0", - "@opentelemetry/web": "^0.20.0", + "@opentelemetry/tracing": "^0.21.0", + "@opentelemetry/web": "^0.21.0", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router-dom": "^5.2.0", diff --git a/examples/redis/package.json b/examples/redis/package.json index 178bc4640a..f570ce9a01 100644 --- a/examples/redis/package.json +++ b/examples/redis/package.json @@ -30,14 +30,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-http": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", "@opentelemetry/instrumentation-redis": "^0.15.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "axios": "^0.21.1", "express": "^4.17.1", "redis": "^2.8.0" diff --git a/examples/restify/package.json b/examples/restify/package.json index a25112fe64..5de7c0f653 100644 --- a/examples/restify/package.json +++ b/examples/restify/package.json @@ -28,14 +28,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-http": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", "@opentelemetry/instrumentation-restify": "^0.16.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "restify": "^4.3.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/router/package.json b/examples/router/package.json index 4d86ceb107..ed694f1c1d 100644 --- a/examples/router/package.json +++ b/examples/router/package.json @@ -28,14 +28,14 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/exporter-zipkin": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-http": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/exporter-zipkin": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", "@opentelemetry/instrumentation-router": "^0.16.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "router": "^1.3.5" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", diff --git a/examples/web/package.json b/examples/web/package.json index 9c1a4a3b94..0cd044211e 100644 --- a/examples/web/package.json +++ b/examples/web/package.json @@ -34,18 +34,18 @@ "webpack-merge": "^4.2.2" }, "dependencies": { - "@opentelemetry/api": "^0.20.0", + "@opentelemetry/api": "^0.21.0", "@opentelemetry/auto-instrumentations-web": "^0.16.0", - "@opentelemetry/context-zone": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/exporter-collector": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/context-zone": "^0.21.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/exporter-collector": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", "@opentelemetry/instrumentation-document-load": "^0.16.0", "@opentelemetry/instrumentation-user-interaction": "^0.16.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.20.0", - "@opentelemetry/propagator-b3": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", - "@opentelemetry/web": "^0.20.0" + "@opentelemetry/instrumentation-xml-http-request": "^0.21.0", + "@opentelemetry/propagator-b3": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", + "@opentelemetry/web": "^0.21.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme" } diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 850f23724e..f88dc73bb0 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -27,10 +27,10 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "@types/sinon": "10.0.2", @@ -44,17 +44,17 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-dns": "^0.20.0", - "@opentelemetry/instrumentation-express": "^0.20.0", - "@opentelemetry/instrumentation-graphql": "^0.20.0", - "@opentelemetry/instrumentation-grpc": "^0.20.0", - "@opentelemetry/instrumentation-http": "^0.20.0", - "@opentelemetry/instrumentation-ioredis": "^0.20.0", - "@opentelemetry/instrumentation-koa": "^0.20.0", - "@opentelemetry/instrumentation-mongodb": "^0.20.0", - "@opentelemetry/instrumentation-mysql": "^0.20.0", - "@opentelemetry/instrumentation-pg": "^0.20.0", - "@opentelemetry/instrumentation-redis": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-dns": "^0.21.0", + "@opentelemetry/instrumentation-express": "^0.21.0", + "@opentelemetry/instrumentation-graphql": "^0.21.0", + "@opentelemetry/instrumentation-grpc": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", + "@opentelemetry/instrumentation-ioredis": "^0.21.0", + "@opentelemetry/instrumentation-koa": "^0.21.0", + "@opentelemetry/instrumentation-mongodb": "^0.21.0", + "@opentelemetry/instrumentation-mysql": "^0.21.0", + "@opentelemetry/instrumentation-pg": "^0.21.0", + "@opentelemetry/instrumentation-redis": "^0.21.0" } } diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 143b9a5914..499918e6d6 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -28,11 +28,11 @@ "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { "@babel/core": "7.14.3", - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/mocha": "8.2.2", "@types/node": "14.17.2", "@types/sinon": "10.0.2", @@ -59,10 +59,10 @@ "webpack-merge": "5.7.3" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/instrumentation-document-load": "^0.20.0", - "@opentelemetry/instrumentation-fetch": "^0.20.0", - "@opentelemetry/instrumentation-user-interaction": "^0.20.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/instrumentation-document-load": "^0.21.0", + "@opentelemetry/instrumentation-fetch": "^0.21.0", + "@opentelemetry/instrumentation-user-interaction": "^0.21.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.21.0" } } diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index 5205a4efff..4fed019570 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -42,10 +42,10 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/mocha": "8.2.2", "@types/node": "14.17.2", "@types/sinon": "10.0.2", @@ -59,9 +59,9 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/api-metrics": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/metrics": "^0.20.0", + "@opentelemetry/api-metrics": "^0.21.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/metrics": "^0.21.0", "systeminformation": "^5.0.0" } } diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index ce928f3c48..d74619b27c 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -52,10 +52,10 @@ "README.md" ], "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/mocha": "8.2.2", "@types/node": "14.17.2", "@types/sinon": "10.0.2", @@ -79,6 +79,6 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/core": "^0.20.0" + "@opentelemetry/core": "^0.21.0" } } diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index c308421aa9..1c79c8d136 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -24,16 +24,16 @@ }, "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme", "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/node": "14.17.2", "gts": "3.1.0", "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0" + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 304358ed14..d69d3353f5 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -41,12 +41,12 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/node": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/core": "0.21.0", + "@opentelemetry/node": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -58,11 +58,11 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/propagator-aws-xray": "^0.20.0", - "@opentelemetry/resources": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/propagator-aws-xray": "^0.21.0", + "@opentelemetry/resources": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "@types/aws-lambda": "8.10.77" } } diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 3b05b41b71..ca68022f8a 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -42,13 +42,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "@types/sinon": "10.0.2", @@ -63,7 +63,7 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", "@types/bunyan": "1.8.6" } } diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 7642c744f4..99f5374e8b 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -41,13 +41,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/core": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/core": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "@types/semver": "7.3.6", @@ -63,8 +63,8 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "semver": "^7.3.2" } } diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 7083db4ae1..06aa326f4c 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -42,13 +42,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -61,9 +61,9 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/express": "4.17.12" } } diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 47b03983f5..909a87e727 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -41,13 +41,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "@types/semver": "7.3.6", @@ -62,8 +62,8 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/generic-pool": "^3.1.9" } } diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 8cd35db62e..e10b47946d 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -43,11 +43,11 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "8.2.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -60,7 +60,7 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", "@types/graphql": "14.5.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 880c94d2c5..06507e4f11 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -41,14 +41,14 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { "@hapi/hapi": "20.1.3", - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.3", "codecov": "3.8.2", @@ -61,8 +61,8 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/hapi__hapi": "20.0.8" } } diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 013ffe482b..93ff2fbf00 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -44,14 +44,14 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/test-utils": "^0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/test-utils": "^0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -65,8 +65,8 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/ioredis": "4.26.4" } } diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 5c16f51abe..9abf75193d 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -41,13 +41,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.0.27", "codecov": "3.7.2", @@ -61,7 +61,7 @@ "typescript": "4.1.3" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 33ea0d16e3..a14c372957 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -43,14 +43,14 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { "@koa/router": "9.4.0", - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.3", "codecov": "3.8.2", @@ -63,9 +63,9 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/koa": "2.13.3", "@types/koa__router": "8.0.4" } diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index ee0e06bdc3..d7a2da0c9a 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -43,13 +43,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -62,8 +62,8 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/mongodb": "3.6.17" } } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index aa8fb50b01..ceb14e1f22 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -41,13 +41,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/test-utils": "^0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/test-utils": "^0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -60,8 +60,8 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/mysql": "2.15.18" } } diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 4ebbc884ff..a7fc5ca619 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -42,12 +42,12 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "@types/sinon": "10.0.2", @@ -61,7 +61,7 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index ac411251f7..42555bec57 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -47,14 +47,14 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/test-utils": "^0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/test-utils": "^0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -69,8 +69,8 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/pg": "8.6.0", "@types/pg-pool": "2.0.2" } diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index f1d7f7226b..d882f27100 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -42,13 +42,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "@types/semver": "7.3.6", @@ -65,7 +65,7 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", "@types/pino": "6.3.8", "semver": "^7.3.5" } diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index b3b40e8ca9..7e6d2d29fd 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -43,14 +43,14 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/test-utils": "^0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/test-utils": "^0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -64,8 +64,8 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/redis": "2.8.29" } } diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 7d035f363d..7de46953b8 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -41,13 +41,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -60,9 +60,9 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/restify": "4.3.7" } } diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 60c4e57ef2..7a7b4ca5af 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -41,13 +41,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", @@ -62,7 +62,7 @@ "typescript": "4.3.2" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index d2f415f45b..9c246d46c7 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -42,13 +42,13 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-async-hooks": "0.20.0", - "@opentelemetry/node": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-async-hooks": "0.21.0", + "@opentelemetry/node": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "@types/sinon": "10.0.2", @@ -64,6 +64,6 @@ "winston2": "npm:winston@2.4.5" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0" } } diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index d9bc1ccb42..7c2de91c03 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -47,11 +47,11 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { "@babel/core": "7.14.3", - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/mocha": "8.2.2", "@types/node": "14.17.2", "@types/sinon": "10.0.2", @@ -78,10 +78,10 @@ "webpack-merge": "5.7.3" }, "dependencies": { - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", - "@opentelemetry/web": "^0.20.0" + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", + "@opentelemetry/web": "^0.21.0" } } diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index c34f64386b..b12f7648fe 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -48,10 +48,10 @@ }, "devDependencies": { "@babel/core": "7.14.3", - "@opentelemetry/api": "0.20.0", - "@opentelemetry/context-zone-peer-dep": "0.20.0", - "@opentelemetry/instrumentation-xml-http-request": "0.20.0", - "@opentelemetry/tracing": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/context-zone-peer-dep": "0.21.0", + "@opentelemetry/instrumentation-xml-http-request": "0.21.0", + "@opentelemetry/tracing": "0.21.0", "@types/jquery": "3.5.5", "@types/mocha": "7.0.2", "@types/node": "14.17.2", @@ -81,12 +81,12 @@ "zone.js": "0.11.4" }, "dependencies": { - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/web": "^0.20.0" + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/web": "^0.21.0" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0", + "@opentelemetry/api": "^0.21.0", "zone.js": "0.11.4" }, "sideEffects": false diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index ebefe1cd1b..85c0eb9a9e 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -48,8 +48,8 @@ }, "devDependencies": { "@babel/core": "7.14.3", - "@opentelemetry/api": "0.20.0", - "@opentelemetry/propagator-b3": "0.20.0", + "@opentelemetry/api": "0.21.0", + "@opentelemetry/propagator-b3": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.3", "@types/react": "17.0.9", @@ -82,15 +82,15 @@ "webpack-merge": "5.7.3" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0", + "@opentelemetry/api": "^0.21.0", "react": "^16.13.1 || ^17.0.0" }, "dependencies": { - "@opentelemetry/context-zone": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", - "@opentelemetry/web": "^0.20.0", + "@opentelemetry/context-zone": "^0.21.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", + "@opentelemetry/web": "^0.21.0", "shimmer": "^1.2.1" } } diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index a4add3e33c..7ba734265e 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -46,10 +46,10 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/mocha": "8.2.2", "@types/node": "14.17.2", "@types/webpack-env": "1.16.0", @@ -71,6 +71,6 @@ "webpack": "4.46.0" }, "dependencies": { - "@opentelemetry/core": "^0.20.0" + "@opentelemetry/core": "^0.21.0" } } diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 823d9105c3..e7900a422e 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -42,10 +42,10 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", "codecov": "3.8.2", diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index e6343614a2..36f0549ce2 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -47,10 +47,10 @@ "access": "public" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "devDependencies": { - "@opentelemetry/api": "0.20.0", + "@opentelemetry/api": "0.21.0", "@types/mocha": "8.2.2", "@types/node": "14.17.2", "@types/webpack-env": "1.16.0", From fd4c34bbb2f1a237aefb74e34ad2839f06073216 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Thu, 10 Jun 2021 15:00:21 -0400 Subject: [PATCH 2/4] chore: only update core --- .../auto-instrumentations-node/package.json | 18 +++++++++--------- .../auto-instrumentations-web/package.json | 4 ++-- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index f88dc73bb0..a131be4eee 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -45,16 +45,16 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.21.0", - "@opentelemetry/instrumentation-dns": "^0.21.0", - "@opentelemetry/instrumentation-express": "^0.21.0", - "@opentelemetry/instrumentation-graphql": "^0.21.0", + "@opentelemetry/instrumentation-dns": "^0.20.0", + "@opentelemetry/instrumentation-express": "^0.20.0", + "@opentelemetry/instrumentation-graphql": "^0.20.0", "@opentelemetry/instrumentation-grpc": "^0.21.0", "@opentelemetry/instrumentation-http": "^0.21.0", - "@opentelemetry/instrumentation-ioredis": "^0.21.0", - "@opentelemetry/instrumentation-koa": "^0.21.0", - "@opentelemetry/instrumentation-mongodb": "^0.21.0", - "@opentelemetry/instrumentation-mysql": "^0.21.0", - "@opentelemetry/instrumentation-pg": "^0.21.0", - "@opentelemetry/instrumentation-redis": "^0.21.0" + "@opentelemetry/instrumentation-ioredis": "^0.20.0", + "@opentelemetry/instrumentation-koa": "^0.20.0", + "@opentelemetry/instrumentation-mongodb": "^0.20.0", + "@opentelemetry/instrumentation-mysql": "^0.20.0", + "@opentelemetry/instrumentation-pg": "^0.20.0", + "@opentelemetry/instrumentation-redis": "^0.20.0" } } diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 499918e6d6..5c849a33a6 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -60,9 +60,9 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.21.0", - "@opentelemetry/instrumentation-document-load": "^0.21.0", + "@opentelemetry/instrumentation-document-load": "^0.20.0", "@opentelemetry/instrumentation-fetch": "^0.21.0", - "@opentelemetry/instrumentation-user-interaction": "^0.21.0", + "@opentelemetry/instrumentation-user-interaction": "^0.20.0", "@opentelemetry/instrumentation-xml-http-request": "^0.21.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index d69d3353f5..4769a8edab 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -59,7 +59,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.21.0", - "@opentelemetry/propagator-aws-xray": "^0.21.0", + "@opentelemetry/propagator-aws-xray": "^0.20.0", "@opentelemetry/resources": "^0.21.0", "@opentelemetry/semantic-conventions": "^0.21.0", "@opentelemetry/tracing": "^0.21.0", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 93ff2fbf00..22590d294c 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -50,7 +50,7 @@ "@opentelemetry/api": "0.21.0", "@opentelemetry/context-async-hooks": "0.21.0", "@opentelemetry/node": "0.21.0", - "@opentelemetry/test-utils": "^0.21.0", + "@opentelemetry/test-utils": "^0.20.0", "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index ceb14e1f22..a5fbbb4389 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -46,7 +46,7 @@ "devDependencies": { "@opentelemetry/api": "0.21.0", "@opentelemetry/context-async-hooks": "0.21.0", - "@opentelemetry/test-utils": "^0.21.0", + "@opentelemetry/test-utils": "^0.20.0", "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 42555bec57..bf637c45f6 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -53,7 +53,7 @@ "@opentelemetry/api": "0.21.0", "@opentelemetry/context-async-hooks": "0.21.0", "@opentelemetry/node": "0.21.0", - "@opentelemetry/test-utils": "^0.21.0", + "@opentelemetry/test-utils": "^0.20.0", "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 7e6d2d29fd..2811117edd 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -49,7 +49,7 @@ "@opentelemetry/api": "0.21.0", "@opentelemetry/context-async-hooks": "0.21.0", "@opentelemetry/node": "0.21.0", - "@opentelemetry/test-utils": "^0.21.0", + "@opentelemetry/test-utils": "^0.20.0", "@opentelemetry/tracing": "0.21.0", "@types/mocha": "7.0.2", "@types/node": "14.17.2", From 15498cf5892ba26f301e5f35b1249c4ad8eafc04 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Thu, 10 Jun 2021 15:07:48 -0400 Subject: [PATCH 3/4] chore: api 21 updates --- .../test/bunyan.test.ts | 5 ++--- .../src/instrumentation.ts | 2 +- .../src/instrumentation.ts | 7 ++++--- .../opentelemetry-instrumentation-pino/test/pino.test.ts | 5 ++--- .../node/opentelemetry-instrumentation-redis/src/utils.ts | 4 ++-- .../test/index.test.ts | 2 +- .../test/winston.test.ts | 5 ++--- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/test/bunyan.test.ts b/plugins/node/opentelemetry-instrumentation-bunyan/test/bunyan.test.ts index 1c8b9f7ed7..69d598d55b 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/test/bunyan.test.ts +++ b/plugins/node/opentelemetry-instrumentation-bunyan/test/bunyan.test.ts @@ -18,7 +18,7 @@ import { InMemorySpanExporter, SimpleSpanProcessor, } from '@opentelemetry/tracing'; -import { context, trace, NoopTracerProvider } from '@opentelemetry/api'; +import { context, INVALID_SPAN_CONTEXT, trace } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/node'; import { isWrapped } from '@opentelemetry/instrumentation'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; @@ -101,8 +101,7 @@ describe('BunyanInstrumentation', () => { }); it('does not inject span context if span context is invalid', () => { - const noopTracer = new NoopTracerProvider().getTracer('noop'); - const span = noopTracer.startSpan('noop'); + const span = trace.wrapSpanContext(INVALID_SPAN_CONTEXT); context.with(trace.setSpan(context.active(), span), () => { logger.info('foo'); sinon.assert.calledOnce(writeSpy); diff --git a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts index aea093d3f0..e8a9b6199a 100644 --- a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts @@ -260,7 +260,7 @@ export class ExpressInstrumentation extends InstrumentationBase< (req[_LAYERS_STORE_PROPERTY] as string[]).pop(); } const callback = args[callbackIdx] as Function; - return context.bind(callback, newContext).apply(this, arguments); + return context.bind(newContext, callback).apply(this, arguments); }; } const result = original.apply(this, arguments); diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts index ea106d6c73..a2c2a037ca 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts @@ -169,7 +169,7 @@ export class PgInstrumentation extends InstrumentationBase { ); // If a parent span exists, bind the callback if (parentSpan) { - args[args.length - 1] = context.bind(args[args.length - 1]); + args[args.length - 1] = context.bind(context.active(), args[args.length - 1]); } } else if ( typeof (args[0] as NormalizedQueryConfig).callback === 'function' @@ -181,7 +181,7 @@ export class PgInstrumentation extends InstrumentationBase { ); // If a parent span existed, bind the callback if (parentSpan) { - callback = context.bind(callback); + callback = context.bind(context.active(), callback); } // Copy the callback instead of writing to args.callback so that we don't modify user's @@ -250,7 +250,7 @@ export class PgInstrumentation extends InstrumentationBase { ) as PgPoolCallback; // If a parent span exists, bind the callback if (parentSpan) { - callback = context.bind(callback); + callback = context.bind(context.active(), callback); } } @@ -263,6 +263,7 @@ export class PgInstrumentation extends InstrumentationBase { if (connectResult instanceof Promise) { const connectResultPromise = connectResult as Promise; return context.bind( + context.active(), connectResultPromise .then(result => { // Return a pass-along promise which ends the span and then goes to user's orig resolvers diff --git a/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts b/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts index 6363fe0900..4bbad5db03 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts +++ b/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts @@ -18,7 +18,7 @@ import { InMemorySpanExporter, SimpleSpanProcessor, } from '@opentelemetry/tracing'; -import { context, trace, NoopTracerProvider, Span } from '@opentelemetry/api'; +import { context, trace, Span, INVALID_SPAN_CONTEXT } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { Writable } from 'stream'; @@ -128,8 +128,7 @@ describe('PinoInstrumentation', () => { }); it('does not inject span context if span context is invalid', () => { - const noopTracer = new NoopTracerProvider().getTracer('noop'); - const span = noopTracer.startSpan('noop'); + const span = trace.wrapSpanContext(INVALID_SPAN_CONTEXT); context.with(trace.setSpan(context.active(), span), () => { testNoInjection(); }); diff --git a/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts b/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts index 854d0b86b3..9ad22b2b43 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-redis/src/utils.ts @@ -48,7 +48,7 @@ const endSpan = (span: Span, err?: Error | null) => { export const getTracedCreateClient = (tracer: Tracer, original: Function) => { return function createClientTrace(this: redisTypes.RedisClient) { const client: redisTypes.RedisClient = original.apply(this, arguments); - return context.bind(client); + return context.bind(context.active(), client); }; }; @@ -63,7 +63,7 @@ export const getTracedCreateStreamTrace = ( return this._patched_redis_stream; }, set(val: EventEmitter) { - context.bind(val); + context.bind(context.active(), val); this._patched_redis_stream = val; }, }); diff --git a/plugins/node/opentelemetry-instrumentation-router/test/index.test.ts b/plugins/node/opentelemetry-instrumentation-router/test/index.test.ts index 6d3b3e143d..0a29bdef05 100644 --- a/plugins/node/opentelemetry-instrumentation-router/test/index.test.ts +++ b/plugins/node/opentelemetry-instrumentation-router/test/index.test.ts @@ -98,7 +98,7 @@ const createServer = async ({ }); }; const handler = parentSpan - ? context.bind(defaultHandler, trace.setSpan(context.active(), parentSpan)) + ? context.bind(trace.setSpan(context.active(), parentSpan), defaultHandler) : defaultHandler; const server = http.createServer(handler); diff --git a/plugins/node/opentelemetry-instrumentation-winston/test/winston.test.ts b/plugins/node/opentelemetry-instrumentation-winston/test/winston.test.ts index 9c5cc1f3c4..4c6c9cf258 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/test/winston.test.ts +++ b/plugins/node/opentelemetry-instrumentation-winston/test/winston.test.ts @@ -18,7 +18,7 @@ import { InMemorySpanExporter, SimpleSpanProcessor, } from '@opentelemetry/tracing'; -import { context, trace, NoopTracerProvider, Span } from '@opentelemetry/api'; +import { context, trace, Span, INVALID_SPAN_CONTEXT } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/node'; import { isWrapped } from '@opentelemetry/instrumentation'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; @@ -115,8 +115,7 @@ describe('WinstonInstrumentation', () => { }); it('does not inject span context if span context is invalid', () => { - const noopTracer = new NoopTracerProvider().getTracer('noop'); - const span = noopTracer.startSpan('noop'); + const span = trace.wrapSpanContext(INVALID_SPAN_CONTEXT); context.with(trace.setSpan(context.active(), span), () => { testNoInjection(); }); From 1f4922f4d8f1245f35ac19fdb3ac99224e0dae3c Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Thu, 10 Jun 2021 15:13:24 -0400 Subject: [PATCH 4/4] chore: lint --- .../opentelemetry-instrumentation-pg/src/instrumentation.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts index a2c2a037ca..052aa432e1 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-pg/src/instrumentation.ts @@ -169,7 +169,10 @@ export class PgInstrumentation extends InstrumentationBase { ); // If a parent span exists, bind the callback if (parentSpan) { - args[args.length - 1] = context.bind(context.active(), args[args.length - 1]); + args[args.length - 1] = context.bind( + context.active(), + args[args.length - 1] + ); } } else if ( typeof (args[0] as NormalizedQueryConfig).callback === 'function'