Skip to content

Commit

Permalink
fix: relax dependencies of Otel stable in experimental
Browse files Browse the repository at this point in the history
Release of experimental and stable is independent.
Relax dependency to avoid that modules get instantiated more then once.
  • Loading branch information
Flarna committed Mar 21, 2022
1 parent 3fd1b1e commit 6c6485c
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 62 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
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.3",
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
18 changes: 9 additions & 9 deletions experimental/packages/opentelemetry-sdk-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 6c6485c

Please sign in to comment.