Skip to content

Commit

Permalink
chore: harmonize dependencies (#1020)
Browse files Browse the repository at this point in the history
* chore: harmonize dependencies

Harmonize dependencies by using following rules:
* peer and dev depend on API ^1.0.0 (like in core repo)
* depend on SDK ^1.0.0 (don't limit user)
* dev-depend on latest SDK pinned (like other deps)
* pin dependencies within the lerna project (like in core repo)

* chore: re-add shimmer
  • Loading branch information
Flarna authored May 14, 2022
1 parent d39c642 commit 3c94b9f
Show file tree
Hide file tree
Showing 51 changed files with 114 additions and 123 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -54,7 +54,7 @@
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/resources": "^1.0.1",
"@opentelemetry/semantic-conventions": "^1.0.1"
"@opentelemetry/resources": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
54 changes: 27 additions & 27 deletions metapackages/auto-instrumentations-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -47,33 +47,33 @@
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/instrumentation-amqplib": "^0.28.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.30.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.6.0",
"@opentelemetry/instrumentation-bunyan": "^0.27.0",
"@opentelemetry/instrumentation-cassandra-driver": "^0.27.0",
"@opentelemetry/instrumentation-connect": "^0.27.0",
"@opentelemetry/instrumentation-dns": "^0.27.1",
"@opentelemetry/instrumentation-express": "^0.28.0",
"@opentelemetry/instrumentation-fastify": "^0.26.0",
"@opentelemetry/instrumentation-generic-pool": "^0.27.2",
"@opentelemetry/instrumentation-graphql": "^0.27.4",
"@opentelemetry/instrumentation-amqplib": "0.28.0",
"@opentelemetry/instrumentation-aws-lambda": "0.30.0",
"@opentelemetry/instrumentation-aws-sdk": "0.6.0",
"@opentelemetry/instrumentation-bunyan": "0.27.1",
"@opentelemetry/instrumentation-cassandra-driver": "0.27.1",
"@opentelemetry/instrumentation-connect": "0.27.1",
"@opentelemetry/instrumentation-dns": "0.27.1",
"@opentelemetry/instrumentation-express": "0.28.0",
"@opentelemetry/instrumentation-fastify": "0.26.0",
"@opentelemetry/instrumentation-generic-pool": "0.27.2",
"@opentelemetry/instrumentation-graphql": "0.27.4",
"@opentelemetry/instrumentation-grpc": "^0.28.0",
"@opentelemetry/instrumentation-hapi": "^0.27.0",
"@opentelemetry/instrumentation-hapi": "0.27.1",
"@opentelemetry/instrumentation-http": "^0.28.0",
"@opentelemetry/instrumentation-ioredis": "^0.28.0",
"@opentelemetry/instrumentation-knex": "^0.27.0",
"@opentelemetry/instrumentation-koa": "^0.28.1",
"@opentelemetry/instrumentation-memcached": "^0.27.0",
"@opentelemetry/instrumentation-mongodb": "^0.29.0",
"@opentelemetry/instrumentation-mysql": "^0.28.0",
"@opentelemetry/instrumentation-mysql2": "^0.29.0",
"@opentelemetry/instrumentation-nestjs-core": "^0.28.3",
"@opentelemetry/instrumentation-net": "^0.27.0",
"@opentelemetry/instrumentation-pg": "^0.28.0",
"@opentelemetry/instrumentation-pino": "^0.28.0",
"@opentelemetry/instrumentation-redis": "^0.29.0",
"@opentelemetry/instrumentation-restify": "^0.27.2",
"@opentelemetry/instrumentation-winston": "^0.27.3"
"@opentelemetry/instrumentation-ioredis": "0.28.0",
"@opentelemetry/instrumentation-knex": "0.27.1",
"@opentelemetry/instrumentation-koa": "0.28.1",
"@opentelemetry/instrumentation-memcached": "0.27.1",
"@opentelemetry/instrumentation-mongodb": "0.29.0",
"@opentelemetry/instrumentation-mysql": "0.28.0",
"@opentelemetry/instrumentation-mysql2": "0.29.0",
"@opentelemetry/instrumentation-nestjs-core": "0.28.3",
"@opentelemetry/instrumentation-net": "0.27.1",
"@opentelemetry/instrumentation-pg": "0.28.0",
"@opentelemetry/instrumentation-pino": "0.28.1",
"@opentelemetry/instrumentation-redis": "0.29.0",
"@opentelemetry/instrumentation-restify": "0.27.2",
"@opentelemetry/instrumentation-winston": "0.27.3"
}
}
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -64,9 +64,9 @@
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/instrumentation-document-load": "^0.27.1",
"@opentelemetry/instrumentation-document-load": "0.27.1",
"@opentelemetry/instrumentation-fetch": "^0.28.0",
"@opentelemetry/instrumentation-user-interaction": "^0.28.1",
"@opentelemetry/instrumentation-user-interaction": "0.28.1",
"@opentelemetry/instrumentation-xml-http-request": "^0.28.0"
}
}
24 changes: 12 additions & 12 deletions packages/opentelemetry-browser-extension-autoinjection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -66,18 +66,18 @@
"@material-ui/core": "4.12.3",
"@material-ui/icons": "4.11.2",
"@material-ui/lab": "4.0.0-alpha.60",
"@opentelemetry/context-zone": "1.2.0",
"@opentelemetry/core": "1.2.0",
"@opentelemetry/exporter-trace-otlp-http": "0.28.0",
"@opentelemetry/exporter-zipkin": "1.2.0",
"@opentelemetry/instrumentation": "0.28.0",
"@opentelemetry/instrumentation-document-load": "^0.27.1",
"@opentelemetry/context-zone": "^1.0.0",
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.28.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/instrumentation-document-load": "0.27.1",
"@opentelemetry/instrumentation-fetch": "0.28.0",
"@opentelemetry/instrumentation-xml-http-request": "0.28.0",
"@opentelemetry/resources": "1.2.0",
"@opentelemetry/sdk-trace-base": "1.2.0",
"@opentelemetry/sdk-trace-web": "1.2.0",
"@opentelemetry/semantic-conventions": "1.2.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.28.0",
"@opentelemetry/resources": "^1.0.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
"@opentelemetry/sdk-trace-web": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"change-case": "4.1.2",
"json5": "2.2.0",
"react": "17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-host-metrics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-id-generator-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-propagation-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions packages/opentelemetry-test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@
"@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"
},
"dependencies": {
"@opentelemetry/core": "1.2.0",
"@opentelemetry/exporter-jaeger": "1.2.0",
"@opentelemetry/instrumentation": "0.28.0",
"@opentelemetry/sdk-trace-node": "1.2.0",
"@opentelemetry/resources": "1.2.0",
"@opentelemetry/sdk-trace-base": "1.2.0",
"@opentelemetry/semantic-conventions": "1.2.0"
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.0.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
"@opentelemetry/resources": "^1.0.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
4 changes: 2 additions & 2 deletions plugins/node/instrumentation-amqplib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"@types/amqplib": "^0.5.17"
},
"devDependencies": {
"@opentelemetry/api": "1.0.1",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "0.29.0",
"@types/lodash": "4.14.178",
"@types/mocha": "8.2.3",
"@types/sinon": "10.0.2",
Expand All @@ -64,7 +65,6 @@
"ts-mocha": "8.0.0",
"nyc": "15.1.0",
"gts": "3.1.0",
"@opentelemetry/contrib-test-utils": "0.29.0",
"sinon": "13.0.1",
"test-all-versions": "5.0.1",
"typescript": "4.3.5"
Expand Down
7 changes: 3 additions & 4 deletions plugins/node/instrumentation-fs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@
"@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",
"@opentelemetry/sdk-trace-node": "1.2.0",
"@types/mocha": "7.0.2",
"@types/node": "14.17.9",
"@types/shimmer": "1.0.2",
"@types/sinon": "^10.0.11",
"gts": "3.1.0",
"mocha": "7.2.0",
Expand All @@ -60,8 +59,8 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/core": "^1.0.1",
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/semantic-conventions": "^1.0.1"
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-tedious/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -60,7 +60,7 @@
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.28.0",
"@opentelemetry/propagator-aws-xray": "^1.0.1",
"@opentelemetry/propagator-aws-xray": "1.0.1",
"@opentelemetry/resources": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/aws-lambda": "8.10.81"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.85.0",
Expand All @@ -58,7 +58,7 @@
"@aws-sdk/client-sqs": "3.85.0",
"@aws-sdk/client-sns": "3.85.0",
"@aws-sdk/types": "3.78.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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@
"tracing"
],
"engines": {
"node": ">=8"
"node": ">=8.12.0"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"bugs": {
"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/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/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.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"
Expand Down
Loading

0 comments on commit 3c94b9f

Please sign in to comment.