From 65528ad67e9e73455988e9772e5aa635746e5958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <18708370+Flarna@users.noreply.github.com> Date: Fri, 6 May 2022 12:51:22 +0200 Subject: [PATCH 1/4] chore: depend on API ^1.0.0 also in devDependencies Avoid API duplication during npm install by allowing a range similar as in other modules. --- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../auto-instrumentations-node/package.json | 2 +- .../auto-instrumentations-web/package.json | 2 +- .../package.json | 2 +- .../opentelemetry-host-metrics/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../opentelemetry-test-utils/package.json | 2 +- .../node/instrumentation-amqplib/package.json | 2 +- plugins/node/instrumentation-fs/package.json | 2 +- .../node/instrumentation-tedious/package.json | 2 +- .../package.json | 2 +- .../package.json | 4 ++-- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../examples/package.json | 20 +++++++++---------- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- 49 files changed, 59 insertions(+), 59 deletions(-) diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 7725e7b311..69dce9a089 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -42,7 +42,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index 134763efe9..85878e42fc 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -41,7 +41,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", diff --git a/detectors/node/opentelemetry-resource-detector-docker/package.json b/detectors/node/opentelemetry-resource-detector-docker/package.json index 4ff3f85c68..ec05cff71f 100644 --- a/detectors/node/opentelemetry-resource-detector-docker/package.json +++ b/detectors/node/opentelemetry-resource-detector-docker/package.json @@ -35,7 +35,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "1.0.4", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@types/mocha": "8.2.3", "@types/node": "^17.0.14", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index eea46cd729..877cfaa034 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -41,7 +41,7 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 72ecfe8dac..6828652e0a 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", "@types/sinon": "10.0.2", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 15935266d6..0b4d3aaad3 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -33,7 +33,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "7.0.2", "@types/node": "16.11.21", "@types/sinon": "10.0.2", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 3bdbfe5301..d22b9c6000 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -35,7 +35,7 @@ "devDependencies": { "@babel/core": "7.15.0", "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", "@types/sinon": "10.0.2", diff --git a/packages/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json index a2b755bcca..b1fb8cf051 100644 --- a/packages/opentelemetry-browser-extension-autoinjection/package.json +++ b/packages/opentelemetry-browser-extension-autoinjection/package.json @@ -29,7 +29,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/chrome": "0.0.154", "@types/jsdom": "16.2.13", "@types/mocha": "8.2.3", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index ccba8a57bd..0be2ad112d 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -46,7 +46,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", "@types/sinon": "10.0.2", diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index bfe0d61b34..31e12cb2fe 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -55,7 +55,7 @@ }, "devDependencies": { "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", "@types/sinon": "10.0.2", diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index 8622d17652..fabe864811 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -42,7 +42,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.1", + "@opentelemetry/api": "^1.0.0", "@types/node": "16.11.21", "gts": "3.1.0", "typescript": "4.3.5" diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index eb528df5e7..46770d08e0 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -41,7 +41,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/node": "16.11.21", "gts": "3.1.0", "typescript": "4.3.5" diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index e49dfbe7e2..de688b75b5 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -52,7 +52,7 @@ "@types/amqplib": "^0.5.17" }, "devDependencies": { - "@opentelemetry/api": "1.0.1", + "@opentelemetry/api": "^1.0.0", "@types/lodash": "4.14.178", "@types/mocha": "8.2.3", "@types/sinon": "10.0.2", diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 4c9be39296..2dd18ea733 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -42,7 +42,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.4", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/resources": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index a7b8412e05..b5a7b7c64e 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -47,7 +47,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 87ff6a5732..f714112a2b 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/core": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index bd247c7676..9dc6d46770 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -49,7 +49,7 @@ "@opentelemetry/core": "^1.0.0", "@opentelemetry/instrumentation": "^0.28.0", "@opentelemetry/semantic-conventions": "^1.0.0", - "@opentelemetry/propagation-utils": "^0.27.0" + "@opentelemetry/propagation-utils": "0.27.0" }, "devDependencies": { "@aws-sdk/client-dynamodb": "3.37.0", @@ -57,7 +57,7 @@ "@aws-sdk/client-s3": "3.37.0", "@aws-sdk/client-sqs": "3.37.0", "@aws-sdk/types": "3.37.0", - "@opentelemetry/api": "1.0.1", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@types/mocha": "8.2.3", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index c67886e4d9..59c9e4a853 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -47,7 +47,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 2ece156a29..394da78952 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -46,7 +46,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index dc141a723a..6afde7def2 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -44,7 +44,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 48e1992b4d..c61a667d21 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/core": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-express/examples/package.json b/plugins/node/opentelemetry-instrumentation-express/examples/package.json index 9deb18b543..8b3f0f28ff 100644 --- a/plugins/node/opentelemetry-instrumentation-express/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/examples/package.json @@ -21,7 +21,7 @@ "tracing" ], "engines": { - "node": ">=8" + "node": ">=8.12.0" }, "author": "OpenTelemetry Authors", "license": "Apache-2.0", @@ -29,16 +29,16 @@ "url": "https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api": "^1.0.4", - "@opentelemetry/exporter-jaeger": "^1.1.1", - "@opentelemetry/exporter-zipkin": "^1.1.1", - "@opentelemetry/instrumentation": "^0.27.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/exporter-jaeger": "^1.0.0", + "@opentelemetry/exporter-zipkin": "^1.0.0", + "@opentelemetry/instrumentation": "^0.28.0", "@opentelemetry/instrumentation-express": "^0.28.0", - "@opentelemetry/instrumentation-http": "^0.27.0", - "@opentelemetry/resources": "^1.1.1", - "@opentelemetry/sdk-trace-base": "^1.1.1", - "@opentelemetry/sdk-trace-node": "^1.1.1", - "@opentelemetry/semantic-conventions": "^1.1.1", + "@opentelemetry/instrumentation-http": "^0.28.0", + "@opentelemetry/resources": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0", + "@opentelemetry/sdk-trace-node": "^1.0.0", + "@opentelemetry/semantic-conventions": "^1.0.0", "axios": "^0.21.1", "cross-env": "^7.0.3", "express": "^4.17.1" diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index eac4ecaa1e..f387a0ef81 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -48,7 +48,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index d63e3a16e3..edc1a36a0f 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/instrumentation-http": "0.28.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 8b37eafad5..035852e393 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 1e056f660f..03c450a24a 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -47,7 +47,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 04c8fac434..acbae1de91 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -46,7 +46,7 @@ }, "devDependencies": { "@hapi/hapi": "20.1.5", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index b527f55f8d..f0a3b2167f 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -50,7 +50,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index a56b2424a9..6832b9c1b2 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index e2bffb872b..628d2db002 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -49,7 +49,7 @@ }, "devDependencies": { "@koa/router": "9.4.0", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 6725a1c7da..5e3cccaf76 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -47,7 +47,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index dfa74886ef..80ba62ce76 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -49,7 +49,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 74966cfa39..c4a13931fc 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index bcef948918..925dc6676b 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -47,7 +47,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 4838d6c10c..8dd82d2a64 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -53,7 +53,7 @@ "@nestjs/microservices": "8.2.6", "@nestjs/platform-express": "8.2.6", "@nestjs/websockets": "8.2.6", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index ab5c85ffbc..88a9ae84a2 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -46,7 +46,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", "@types/mocha": "7.0.2", diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 20bfa2a30a..414dd77830 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -53,7 +53,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index b6cb13c465..925ea19fec 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -47,7 +47,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 2f228b9f99..d481bbaef2 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -49,7 +49,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/contrib-test-utils": "0.29.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 999a58fd06..2702e4a174 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index fc1cc86d11..95f892b568 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 10f36db467..15d31a5641 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -47,7 +47,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-async-hooks": "1.2.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@opentelemetry/sdk-trace-node": "1.2.0", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 6f9578d31c..87b6b51c0b 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -52,7 +52,7 @@ "devDependencies": { "@babel/core": "7.15.0", "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", "@types/sinon": "10.0.2", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index b7e8f50a8d..b87cd9b8a1 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -49,7 +49,7 @@ "devDependencies": { "@babel/core": "7.15.0", "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/sdk-trace-base": "1.2.0", "@types/jquery": "3.5.6", "@types/mocha": "7.0.2", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 5a4b7359cb..9f7ea1119a 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -49,7 +49,7 @@ "devDependencies": { "@babel/core": "7.15.0", "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/context-zone-peer-dep": "1.2.0", "@opentelemetry/instrumentation-xml-http-request": "0.28.0", "@opentelemetry/sdk-trace-base": "1.2.0", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 8829e5b7c5..020d5b6c69 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -49,7 +49,7 @@ "devDependencies": { "@babel/core": "7.15.0", "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@opentelemetry/propagator-b3": "1.2.0", "@types/mocha": "7.0.2", "@types/node": "16.11.21", diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index e01f03f409..0aeb7dced2 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -49,7 +49,7 @@ }, "devDependencies": { "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", "@types/webpack-env": "1.16.2", diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index f229995812..9378ad3729 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -45,7 +45,7 @@ "@opentelemetry/api": "^1.0.0" }, "devDependencies": { - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "7.0.2", "@types/node": "16.11.21", "grpc": "1.24.11", diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 84e97c4de1..94256e929f 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -50,7 +50,7 @@ }, "devDependencies": { "@jsdevtools/coverage-istanbul-loader": "3.0.5", - "@opentelemetry/api": "1.0.2", + "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "16.11.21", "@types/webpack-env": "1.16.2", From 4b684458af4587ef3b38f5379b7c9973c14de07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <18708370+Flarna@users.noreply.github.com> Date: Fri, 6 May 2022 13:02:32 +0200 Subject: [PATCH 2/4] chore: allow unpinned api dependency --- scripts/peer-api-check.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/peer-api-check.js b/scripts/peer-api-check.js index 50bd74f1f6..228388c04a 100644 --- a/scripts/peer-api-check.js +++ b/scripts/peer-api-check.js @@ -34,12 +34,6 @@ if (pjson.dependencies && pjson.dependencies['@opentelemetry/api']) { const peerVersion = pjson.peerDependencies && pjson.peerDependencies['@opentelemetry/api']; const devVersion = pjson.devDependencies && pjson.devDependencies['@opentelemetry/api']; if (peerVersion) { - // error if not pinned - if (!/^[0-9]/.test(devVersion)) { - throw new Error( - `Package ${pjson.name} does't have API version pinned in dev dependencies: ${devVersion}` - ); - } if (!semver.satisfies(devVersion, peerVersion)) { throw new Error( `Package ${pjson.name} depends on peer API version ${peerVersion} ` + From c103355aadcf682e54f53f6e6fb9760f081010bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <18708370+Flarna@users.noreply.github.com> Date: Fri, 6 May 2022 13:12:38 +0200 Subject: [PATCH 3/4] chore: change peer-api check to equals --- scripts/peer-api-check.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/peer-api-check.js b/scripts/peer-api-check.js index 228388c04a..66b9a1ef71 100644 --- a/scripts/peer-api-check.js +++ b/scripts/peer-api-check.js @@ -15,7 +15,6 @@ */ const path = require('path'); -const semver = require('semver'); const appRoot = process.cwd(); const packageJsonUrl = path.resolve(`${appRoot}/package.json`); @@ -34,10 +33,10 @@ if (pjson.dependencies && pjson.dependencies['@opentelemetry/api']) { const peerVersion = pjson.peerDependencies && pjson.peerDependencies['@opentelemetry/api']; const devVersion = pjson.devDependencies && pjson.devDependencies['@opentelemetry/api']; if (peerVersion) { - if (!semver.satisfies(devVersion, peerVersion)) { + if (devVersion !== peerVersion) { throw new Error( `Package ${pjson.name} depends on peer API version ${peerVersion} ` + - `but version ${devVersion} in development which doesn't satisfy the peer API version` + `but version ${devVersion} in development which doesn't match the peer API version` ); } console.log(`${pjson.name} OK`); From 35baacaf8f576f5bac72c117a0532b0df8a4a150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <18708370+Flarna@users.noreply.github.com> Date: Mon, 9 May 2022 12:26:55 +0200 Subject: [PATCH 4/4] chore: remove semver dependency --- scripts/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/package.json b/scripts/package.json index 5d9c49bffe..e5b70704cb 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -3,6 +3,5 @@ "private": true, "license": "Apache-2.0", "dependencies": { - "semver": "7.3.5" } }