From 6c6485c4cdc87b8a8ef32e65c61a0c697d3f1a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <18708370+Flarna@users.noreply.github.com> Date: Mon, 21 Mar 2022 16:13:39 +0100 Subject: [PATCH 1/3] fix: relax dependencies of Otel stable in experimental Release of experimental and stable is independent. Relax dependency to avoid that modules get instantiated more then once. --- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 8 ++++---- .../package.json | 6 +++--- .../package.json | 16 ++++++++-------- .../package.json | 14 +++++++------- .../package.json | 14 +++++++------- .../package.json | 16 ++++++++-------- .../opentelemetry-instrumentation/package.json | 4 ++-- .../examples/metrics/package.json | 4 ++-- .../package.json | 8 ++++---- .../opentelemetry-sdk-node/package.json | 18 +++++++++--------- 12 files changed, 62 insertions(+), 62 deletions(-) diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index b630a9575c..48dee028fa 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -48,7 +48,7 @@ }, "devDependencies": { "@babel/core": "7.16.0", - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/api-metrics": "0.27.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", @@ -64,16 +64,16 @@ "typescript": "4.4.4" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { "@grpc/grpc-js": "1.4.4", "@grpc/proto-loader": "^0.6.4", - "@opentelemetry/core": "1.0.1", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/exporter-metrics-otlp-http": "0.27.0", "@opentelemetry/exporter-trace-otlp-grpc": "0.27.0", "@opentelemetry/exporter-trace-otlp-http": "0.27.0", - "@opentelemetry/resources": "1.0.1", + "@opentelemetry/resources": "^1.0.0", "@opentelemetry/sdk-metrics-base": "0.27.0" } } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index d7fcb2fa6c..6f56e466fa 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -61,7 +61,7 @@ }, "devDependencies": { "@babel/core": "7.16.0", - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/sinon": "10.0.6", @@ -88,13 +88,13 @@ "webpack-merge": "5.8.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { "@opentelemetry/api-metrics": "0.27.0", - "@opentelemetry/core": "1.0.1", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/exporter-trace-otlp-http": "0.27.0", - "@opentelemetry/resources": "1.0.1", + "@opentelemetry/resources": "^1.0.0", "@opentelemetry/sdk-metrics-base": "0.27.0" } } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json index bb4fb0539b..ae631c2cfa 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json @@ -48,7 +48,7 @@ }, "devDependencies": { "@babel/core": "7.16.0", - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/api-metrics": "0.27.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", @@ -64,15 +64,15 @@ "typescript": "4.4.4" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { "@grpc/proto-loader": "^0.6.4", - "@opentelemetry/core": "1.0.1", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/exporter-metrics-otlp-http": "0.27.0", "@opentelemetry/exporter-trace-otlp-http": "0.27.0", "@opentelemetry/exporter-trace-otlp-proto": "0.27.0", - "@opentelemetry/resources": "1.0.1", + "@opentelemetry/resources": "^1.0.0", "@opentelemetry/sdk-metrics-base": "0.27.0", "protobufjs": "^6.9.0" } diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index 536f61e136..4de08bcce3 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -41,7 +41,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/sinon": "10.0.6", @@ -54,11 +54,11 @@ "typescript": "4.4.4" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { "@opentelemetry/api-metrics": "0.27.0", - "@opentelemetry/core": "1.0.1", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/sdk-metrics-base": "0.27.0" } } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 715e8cae53..f8d649fd53 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -53,10 +53,10 @@ }, "devDependencies": { "@babel/core": "7.16.0", - "@opentelemetry/api": "^1.0.3", - "@opentelemetry/context-zone": "1.0.1", - "@opentelemetry/propagator-b3": "1.0.1", - "@opentelemetry/sdk-trace-base": "1.0.1", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-zone": "^1.0.0", + "@opentelemetry/propagator-b3": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/sinon": "10.0.6", @@ -82,12 +82,12 @@ "webpack-merge": "5.8.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.0.1", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/instrumentation": "0.27.0", - "@opentelemetry/sdk-trace-web": "1.0.1", - "@opentelemetry/semantic-conventions": "1.0.1" + "@opentelemetry/sdk-trace-web": "^1.0.0", + "@opentelemetry/semantic-conventions": "^1.0.0" } } diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 126e8e53f8..db1a19d759 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -45,11 +45,11 @@ "devDependencies": { "@grpc/grpc-js": "1.4.4", "@grpc/proto-loader": "0.6.6", - "@opentelemetry/api": "^1.0.3", - "@opentelemetry/context-async-hooks": "1.0.1", - "@opentelemetry/core": "1.0.1", - "@opentelemetry/sdk-trace-base": "1.0.1", - "@opentelemetry/sdk-trace-node": "1.0.1", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-async-hooks": "^1.0.0", + "@opentelemetry/core": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0", + "@opentelemetry/sdk-trace-node": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/semver": "7.3.9", @@ -66,11 +66,11 @@ "typescript": "4.4.4" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { "@opentelemetry/api-metrics": "0.27.0", "@opentelemetry/instrumentation": "0.27.0", - "@opentelemetry/semantic-conventions": "1.0.1" + "@opentelemetry/semantic-conventions": "^1.0.0" } } diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index e287d9429a..2d07fbb574 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -43,10 +43,10 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^1.0.3", - "@opentelemetry/context-async-hooks": "1.0.1", - "@opentelemetry/sdk-trace-base": "1.0.1", - "@opentelemetry/sdk-trace-node": "1.0.1", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-async-hooks": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0", + "@opentelemetry/sdk-trace-node": "^1.0.0", "@types/got": "9.6.12", "@types/mocha": "8.2.3", "@types/node": "14.17.33", @@ -69,12 +69,12 @@ "typescript": "4.4.4" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.0.1", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/instrumentation": "0.27.0", - "@opentelemetry/semantic-conventions": "1.0.1", + "@opentelemetry/semantic-conventions": "^1.0.0", "semver": "^7.3.5" } } diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 434171f642..f7b9fbd973 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -53,10 +53,10 @@ }, "devDependencies": { "@babel/core": "7.16.0", - "@opentelemetry/api": "^1.0.3", - "@opentelemetry/context-zone": "1.0.1", - "@opentelemetry/propagator-b3": "1.0.1", - "@opentelemetry/sdk-trace-base": "1.0.1", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-zone": "^1.0.0", + "@opentelemetry/propagator-b3": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/sinon": "10.0.6", @@ -82,12 +82,12 @@ "webpack-merge": "5.8.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.0.1", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/instrumentation": "0.27.0", - "@opentelemetry/sdk-trace-web": "1.0.1", - "@opentelemetry/semantic-conventions": "1.0.1" + "@opentelemetry/sdk-trace-web": "^1.0.0", + "@opentelemetry/semantic-conventions": "^1.0.0" } } diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index f70dc719da..09cd46843d 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -69,11 +69,11 @@ "shimmer": "^1.2.1" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "devDependencies": { "@babel/core": "7.16.0", - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/semver": "7.3.9", diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/examples/metrics/package.json b/experimental/packages/opentelemetry-sdk-metrics-base/examples/metrics/package.json index dfa9a6abf3..a0f1cd1afe 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/examples/metrics/package.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/examples/metrics/package.json @@ -26,8 +26,8 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^1.0.2", - "@opentelemetry/core": "^1.0.1", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/exporter-prometheus": "^0.27.0", "@opentelemetry/sdk-metrics-base": "^0.27.0" }, diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/package.json b/experimental/packages/opentelemetry-sdk-metrics-base/package.json index 35f62cfb15..d684f67bb8 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/package.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/package.json @@ -53,7 +53,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.0.0", "@types/lodash.merge": "4.6.6", "@types/mocha": "8.2.3", "@types/node": "14.17.33", @@ -73,13 +73,13 @@ "typescript": "4.4.4" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "todo": "Move API metrics to peer dependencies. While it is using an unpublished name, lerna doesn't properly link it if it is in peer dependencies", "dependencies": { "@opentelemetry/api-metrics-wip": "0.27.0", - "@opentelemetry/core": "1.0.1", - "@opentelemetry/resources": "1.0.1", + "@opentelemetry/core": "^1.0.0", + "@opentelemetry/resources": "^1.0.0", "lodash.merge": "4.6.2" } } diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index 88c35e48dc..e8f1fe5f8b 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -43,21 +43,21 @@ }, "dependencies": { "@opentelemetry/api-metrics": "0.27.0", - "@opentelemetry/core": "~1.0.0", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/instrumentation": "0.27.0", - "@opentelemetry/resource-detector-aws": "~1.0.0", - "@opentelemetry/resource-detector-gcp": "~0.26.0", - "@opentelemetry/resources": "~1.0.0", + "@opentelemetry/resource-detector-aws": "^1.0.0", + "@opentelemetry/resource-detector-gcp": "^0.26.0", + "@opentelemetry/resources": "^1.0.0", "@opentelemetry/sdk-metrics-base": "0.27.0", - "@opentelemetry/sdk-trace-base": "~1.0.0", - "@opentelemetry/sdk-trace-node": "~1.0.0" + "@opentelemetry/sdk-trace-base": "^1.0.0", + "@opentelemetry/sdk-trace-node": "^1.0.0" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.1.0" + "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "~1.0.3", - "@opentelemetry/context-async-hooks": "1.0.1", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/context-async-hooks": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/semver": "7.3.9", From 11751c342c3553cf5dded1d7e4c222d954782265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <18708370+Flarna@users.noreply.github.com> Date: Mon, 21 Mar 2022 16:48:31 +0100 Subject: [PATCH 2/3] fixup! fix: relax dependencies of Otel stable in experimental --- experimental/backwards-compatability/node10/package.json | 2 +- experimental/backwards-compatability/node12/package.json | 2 +- experimental/backwards-compatability/node8/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/experimental/backwards-compatability/node10/package.json b/experimental/backwards-compatability/node10/package.json index b2ea0dc3c7..bcbfcc778e 100644 --- a/experimental/backwards-compatability/node10/package.json +++ b/experimental/backwards-compatability/node10/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@opentelemetry/sdk-node": "0.27.0", - "@opentelemetry/sdk-trace-base": "1.0.1" + "@opentelemetry/sdk-trace-base": "^1.0.0" }, "devDependencies": { "@types/node": "10.17.60", diff --git a/experimental/backwards-compatability/node12/package.json b/experimental/backwards-compatability/node12/package.json index 1409706f4b..f3cf568cb6 100644 --- a/experimental/backwards-compatability/node12/package.json +++ b/experimental/backwards-compatability/node12/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@opentelemetry/sdk-node": "0.27.0", - "@opentelemetry/sdk-trace-base": "1.0.1" + "@opentelemetry/sdk-trace-base": "^1.0.0" }, "devDependencies": { "@types/node": "12.20.37", diff --git a/experimental/backwards-compatability/node8/package.json b/experimental/backwards-compatability/node8/package.json index 5b180a3ed2..75e78a7d38 100644 --- a/experimental/backwards-compatability/node8/package.json +++ b/experimental/backwards-compatability/node8/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@opentelemetry/sdk-node": "0.27.0", - "@opentelemetry/sdk-trace-base": "1.0.1" + "@opentelemetry/sdk-trace-base": "^1.0.0" }, "devDependencies": { "@types/node": "8.10.66", From 2f9f17bc75d904777c8ae09be8a291ecd5e2900d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <18708370+Flarna@users.noreply.github.com> Date: Mon, 28 Mar 2022 12:18:10 +0200 Subject: [PATCH 3/3] fixup! adapt trace exporters --- .../packages/exporter-trace-otlp-grpc/package.json | 10 +++++----- .../packages/exporter-trace-otlp-http/package.json | 10 +++++----- .../packages/exporter-trace-otlp-proto/package.json | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json index 3e62fe6e3c..1bf00fdd8d 100644 --- a/experimental/packages/exporter-trace-otlp-grpc/package.json +++ b/experimental/packages/exporter-trace-otlp-grpc/package.json @@ -49,7 +49,7 @@ }, "devDependencies": { "@babel/core": "7.16.0", - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/sinon": "10.0.6", @@ -64,14 +64,14 @@ "typescript": "4.4.4" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.1.1", "@grpc/grpc-js": "^1.5.9", "@grpc/proto-loader": "^0.6.9", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/exporter-trace-otlp-http": "0.27.0", - "@opentelemetry/resources": "1.1.1", - "@opentelemetry/sdk-trace-base": "1.1.1" + "@opentelemetry/resources": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0" } } diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 151ee9fd39..a7a870ecab 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -62,7 +62,7 @@ }, "devDependencies": { "@babel/core": "7.16.0", - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/sinon": "10.0.6", @@ -89,11 +89,11 @@ "webpack-merge": "5.8.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.1.1", - "@opentelemetry/resources": "1.1.1", - "@opentelemetry/sdk-trace-base": "1.1.1" + "@opentelemetry/core": "^1.0.0", + "@opentelemetry/resources": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0" } } diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json index be9403b780..56dd1f3694 100644 --- a/experimental/packages/exporter-trace-otlp-proto/package.json +++ b/experimental/packages/exporter-trace-otlp-proto/package.json @@ -49,7 +49,7 @@ }, "devDependencies": { "@babel/core": "7.16.0", - "@opentelemetry/api": "^1.0.3", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.33", "@types/sinon": "10.0.6", @@ -64,14 +64,14 @@ "typescript": "4.4.4" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.3" + "@opentelemetry/api": "^1.0.0" }, "dependencies": { - "@opentelemetry/core": "1.1.1", "@grpc/proto-loader": "^0.6.9", + "@opentelemetry/core": "^1.0.0", "@opentelemetry/exporter-trace-otlp-http": "0.27.0", - "@opentelemetry/resources": "1.1.1", - "@opentelemetry/sdk-trace-base": "1.1.1", + "@opentelemetry/resources": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0", "protobufjs": "^6.9.0" } }