From 44ae2c5fc7144b41943c36eb3dd57080241a293d Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Fri, 7 Feb 2025 14:47:42 -0800 Subject: [PATCH] chore: unpin semantic-conventions package dep There is no need to pin deps for the semantic-conventions package. Our recommendation is to not pin, to allow for de-duplication of installs of the package in node_modules trees to reduce install size. The concerns that motivate pinning other otel deps, described in https://github.com/open-telemetry/opentelemetry-js/issues/5283, do not apply to the semantic-conventions package. This also removes the updating of the semconv deps when the semconv package is released. There should be no need to do so. A particular package can bump its minimum semconv dep if/when it uses exports in a newer version. --- examples/esm-http-ts/package.json | 2 +- examples/http/package.json | 2 +- examples/https/package.json | 2 +- examples/opentelemetry-web/package.json | 2 +- examples/otlp-exporter-node/package.json | 2 +- .../examples/opencensus-shim/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../opentelemetry-sdk-node/package.json | 2 +- experimental/packages/web-common/package.json | 2 +- package-lock.json | 84 ++++++++--------- package.json | 4 +- packages/opentelemetry-core/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/opentelemetry-resources/package.json | 2 +- .../opentelemetry-sdk-trace-base/package.json | 2 +- .../opentelemetry-sdk-trace-node/package.json | 2 +- .../opentelemetry-sdk-trace-web/package.json | 2 +- .../package.json | 2 +- scripts/align-semconv-deps.js | 89 ------------------- semantic-conventions/README.md | 2 +- 25 files changed, 66 insertions(+), 155 deletions(-) delete mode 100755 scripts/align-semconv-deps.js diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json index c4f36c88479..13618c94a53 100644 --- a/examples/esm-http-ts/package.json +++ b/examples/esm-http-ts/package.json @@ -38,6 +38,6 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" } } diff --git a/examples/http/package.json b/examples/http/package.json index 068a249a478..bcf5ddd6eb2 100644 --- a/examples/http/package.json +++ b/examples/http/package.json @@ -37,7 +37,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http", "devDependencies": { diff --git a/examples/https/package.json b/examples/https/package.json index e0d62fea074..d893a1b7bf0 100644 --- a/examples/https/package.json +++ b/examples/https/package.json @@ -41,7 +41,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https", "devDependencies": { diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json index d317c6421c0..fbed9a416fc 100644 --- a/examples/opentelemetry-web/package.json +++ b/examples/opentelemetry-web/package.json @@ -58,7 +58,7 @@ "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-web": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web" } diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json index 244c99812c2..422e1eddc18 100644 --- a/examples/otlp-exporter-node/package.json +++ b/examples/otlp-exporter-node/package.json @@ -40,7 +40,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node" } diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json index 6e8fdf59b5b..70cb72a3df7 100644 --- a/experimental/examples/opencensus-shim/package.json +++ b/experimental/examples/opencensus-shim/package.json @@ -37,7 +37,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@opentelemetry/shim-opencensus": "0.57.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim" diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index 5056c3f61b6..550b3560e27 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -44,7 +44,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 7cd8da64185..410defc0252 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -90,7 +90,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/instrumentation": "0.57.0", "@opentelemetry/sdk-trace-web": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch", "sideEffects": false, diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index 03ef01f40c2..e786987ca85 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -72,7 +72,7 @@ }, "dependencies": { "@opentelemetry/instrumentation": "0.57.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc", "sideEffects": false diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 831a58c9ed4..0051a124f62 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -74,7 +74,7 @@ "dependencies": { "@opentelemetry/core": "1.30.0", "@opentelemetry/instrumentation": "0.57.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "forwarded-parse": "2.1.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-http", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index d17aa5a087e..589a942d0bb 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -89,7 +89,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/instrumentation": "0.57.0", "@opentelemetry/sdk-trace-web": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", "sideEffects": false diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index d3293c86a39..a28bf5a3e55 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -65,7 +65,7 @@ "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" diff --git a/experimental/packages/web-common/package.json b/experimental/packages/web-common/package.json index 023092af51d..c5b85c00d63 100644 --- a/experimental/packages/web-common/package.json +++ b/experimental/packages/web-common/package.json @@ -68,7 +68,7 @@ "dependencies": { "@opentelemetry/sdk-logs": "0.57.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@babel/core": "7.26.7", diff --git a/package-lock.json b/package-lock.json index b059f3d79c6..a4317588519 100644 --- a/package-lock.json +++ b/package-lock.json @@ -154,7 +154,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "engines": { "node": "^18.19.0 || >=20.6.0" @@ -173,7 +173,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "cross-env": "^6.0.0" @@ -195,7 +195,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "cross-env": "^6.0.0" @@ -223,7 +223,7 @@ "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-web": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@babel/core": "^7.23.6", @@ -256,7 +256,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "engines": { "node": "^18.19.0 || >=20.6.0" @@ -364,7 +364,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@opentelemetry/shim-opencensus": "0.57.0" }, "engines": { @@ -2524,7 +2524,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.9.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -2604,7 +2604,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/instrumentation": "0.57.0", "@opentelemetry/sdk-trace-web": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@babel/core": "7.26.7", @@ -3004,7 +3004,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "0.57.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@bufbuild/buf": "1.49.0", @@ -3049,7 +3049,7 @@ "dependencies": { "@opentelemetry/core": "1.30.0", "@opentelemetry/instrumentation": "0.57.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "forwarded-parse": "2.1.2" }, "devDependencies": { @@ -3095,7 +3095,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/instrumentation": "0.57.0", "@opentelemetry/sdk-trace-web": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@babel/core": "7.26.7", @@ -3869,7 +3869,7 @@ "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@opentelemetry/api": "1.9.0", @@ -4998,7 +4998,7 @@ "dependencies": { "@opentelemetry/sdk-logs": "0.57.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@babel/core": "7.26.7", @@ -31084,7 +31084,7 @@ "version": "1.30.0", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", @@ -31176,7 +31176,7 @@ "dependencies": { "@opentelemetry/core": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "jaeger-client": "^3.15.0" }, "devDependencies": { @@ -31215,7 +31215,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@babel/core": "7.26.7", @@ -31734,7 +31734,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", @@ -31987,7 +31987,7 @@ "dependencies": { "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", @@ -32085,7 +32085,7 @@ "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", "@opentelemetry/resources": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -32117,7 +32117,7 @@ "dependencies": { "@opentelemetry/core": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "devDependencies": { "@babel/core": "7.26.7", @@ -32518,7 +32518,7 @@ "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "opentracing": "^0.14.4" }, "devDependencies": { @@ -36230,7 +36230,7 @@ "version": "file:packages/opentelemetry-core", "requires": { "@opentelemetry/api": ">=1.0.0 <1.10.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -36298,7 +36298,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -37040,7 +37040,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-metrics": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -37470,7 +37470,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -37966,7 +37966,7 @@ "@opentelemetry/propagator-b3": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-web": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -38214,7 +38214,7 @@ "@opentelemetry/instrumentation": "0.57.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@protobuf-ts/grpc-transport": "2.9.4", "@protobuf-ts/runtime": "2.9.4", "@protobuf-ts/runtime-rpc": "2.9.4", @@ -38247,7 +38247,7 @@ "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/request-promise-native": "1.0.21", @@ -38285,7 +38285,7 @@ "@opentelemetry/propagator-b3": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-web": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -38969,7 +38969,7 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0", "@opentelemetry/core": "1.30.0", "@opentelemetry/resources_1.9.0": "npm:@opentelemetry/resources@1.9.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -39709,7 +39709,7 @@ "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -39736,7 +39736,7 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0", "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -39806,7 +39806,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", @@ -39836,7 +39836,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/jquery": "3.5.32", "@types/mocha": "10.0.10", "@types/node": "18.6.5", @@ -40140,7 +40140,7 @@ "@opentelemetry/propagator-b3": "1.30.0", "@opentelemetry/propagator-jaeger": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "cross-var": "1.1.0", @@ -40185,7 +40185,7 @@ "@opentelemetry/api-logs": "0.57.0", "@opentelemetry/sdk-logs": "0.57.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "10.0.20", @@ -45495,7 +45495,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" } }, "espree": { @@ -45634,7 +45634,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" } }, "execa": { @@ -46899,7 +46899,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "cross-env": "^6.0.0" } }, @@ -46974,7 +46974,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "cross-env": "^6.0.0" } }, @@ -51402,7 +51402,7 @@ "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-node": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@opentelemetry/shim-opencensus": "0.57.0" } }, @@ -55448,7 +55448,7 @@ "@opentelemetry/sdk-metrics": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", "@opentelemetry/sdk-trace-web": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "babel-loader": "^8.0.6", "ts-loader": "^9.2.6", "typescript": "5.0.4", diff --git a/package.json b/package.json index 6e5c8b12dc7..425406dd647 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,8 @@ "prepare_release:sdk:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_semconv && npm run _lerna:version_patch && npm run _restore:package-json && npm run _changelog:prepare_experimental && npm run _changelog:prepare_stable", "prepare_release:sdk:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_semconv && npm run _lerna:version_minor && npm run _restore:package-json && npm run _changelog:prepare_experimental && npm run _changelog:prepare_stable", "comment_prepare_4": "echo semconv preparation scripts only prepare semconv package", - "prepare_release:semconv:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_everything_except_semconv && npm run _lerna:version_patch && npm run _restore:package-json && node ./scripts/align-semconv-deps.js && npm run _changelog:prepare_semconv", - "prepare_release:semconv:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_everything_except_semconv && npm run _lerna:version_minor && npm run _restore:package-json && node ./scripts/align-semconv-deps.js && npm run _changelog:prepare_semconv", + "prepare_release:semconv:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_everything_except_semconv && npm run _lerna:version_patch && npm run _restore:package-json && npm run _changelog:prepare_semconv", + "prepare_release:semconv:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_everything_except_semconv && npm run _lerna:version_minor && npm run _restore:package-json && npm run _changelog:prepare_semconv", "prepare_release:all:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_semconv && npm run _lerna:version_minor && cd api/ && npm version minor && cd .. && lerna run align-api-deps && npm run _restore:package-json && npm run _changelog:prepare_all", "release:publish": "lerna publish --concurrency 1 from-package --no-push --no-private --no-git-tag-version --no-verify-access", "comment_internal": "echo scripts below this line are for internal use", diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index d699e8676cc..54fafa8d467 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -88,7 +88,7 @@ "@opentelemetry/api": ">=1.0.0 <1.10.0" }, "dependencies": { - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core", "sideEffects": false diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index d874c40c0dd..15f4bfb938a 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -63,7 +63,7 @@ "dependencies": { "@opentelemetry/core": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "jaeger-client": "^3.15.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-jaeger", diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 31a859e6530..22b326c5f9c 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -92,7 +92,7 @@ "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-zipkin", "sideEffects": false diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 4666eb4d176..047aee88969 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -91,7 +91,7 @@ }, "dependencies": { "@opentelemetry/core": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index c815bcd0489..003b628ff40 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -92,7 +92,7 @@ "dependencies": { "@opentelemetry/core": "1.30.0", "@opentelemetry/resources": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base", "sideEffects": false diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index d5166f5b064..f8f231ae7bd 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0", "@opentelemetry/resources": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "@types/mocha": "10.0.10", "@types/node": "18.6.5", "@types/sinon": "17.0.3", diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index b088d208ea2..a45dec995c4 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -90,7 +90,7 @@ "dependencies": { "@opentelemetry/core": "1.30.0", "@opentelemetry/sdk-trace-base": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0" + "@opentelemetry/semantic-conventions": "^1.29.0" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web", "sideEffects": false diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 7482084d3cd..463f43bd99b 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -59,7 +59,7 @@ }, "dependencies": { "@opentelemetry/core": "1.30.0", - "@opentelemetry/semantic-conventions": "1.29.0", + "@opentelemetry/semantic-conventions": "^1.29.0", "opentracing": "^0.14.4" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opentracing", diff --git a/scripts/align-semconv-deps.js b/scripts/align-semconv-deps.js deleted file mode 100755 index 042785ef85e..00000000000 --- a/scripts/align-semconv-deps.js +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env node -/** - * This updates the `@opentelemetry/semantic-conventions` dep (or devDep) - * in every "package.json" in the workspace to match the version in - * "/semantic-conventions/package.json" - * - * This should be run from the repository root. - */ - -const fs = require('fs'); -const path = require('path'); -const globSync = require('glob').sync; -const {spawnSync} = require('child_process'); - -const TOP = path.resolve(__dirname, '..'); - -function getAllWorkspaceDirs() { - const pj = JSON.parse( - fs.readFileSync(path.join(TOP, 'package.json'), 'utf8') - ); - return pj.workspaces - .map((wsGlob) => globSync(path.join(wsGlob, 'package.json'))) - .flat() - .map(path.dirname); -} - -function alignSemconvDeps({dryRun}){ - const semconvVer = JSON.parse(fs.readFileSync(path.join(TOP, 'semantic-conventions', 'package.json'))).version; - - const wsDirs = getAllWorkspaceDirs(); - - // Find all workspaces that have a dep or devDep on semconv that needs updating. - const targetWsDirs = wsDirs - .filter(wsDir => { - const pj = JSON.parse(fs.readFileSync(path.join(wsDir, 'package.json'))); - const depRange = pj.dependencies && pj.dependencies['@opentelemetry/semantic-conventions']; - const devDepRange = pj.devDependencies && pj.devDependencies['@opentelemetry/semantic-conventions']; - if (depRange && devDepRange) { - throw new Error(`why does "${wsDir}/package.json" have a dep *and* devDep on the semconv package?`); - } else if (!depRange && !devDepRange) { - return false; - } else { - const currDepRange = depRange || devDepRange; - if (currDepRange === semconvVer) { - return false; - } - return true; - } - }); - if (targetWsDirs.length === 0) { - console.log(`All workspace packages are already aligned to @opentelemetry/semantic-conventions@${semconvVer}.`); - return; - } - - // Do the updates. - console.log(`Updating semconv dep in ${targetWsDirs.length} workspace dirs:`); - targetWsDirs.forEach(wsDir => { - const argv = ['npm', 'install', '--save-exact', '@opentelemetry/semantic-conventions@' + semconvVer]; - console.log(` $ cd ${wsDir} && ${argv.join(' ')}`); - if (!dryRun) { - // For a reason I don't understand, this npm install needs to be run - // **twice**. The first time partially updates the package-lock. The - // second time updates the local package.json and fully updates the - // package-lock. See notes about "twice" at https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1917#issue-2109198809 - // for somethign similar. - for (let i = 0; i < 2; i++) { - const p = spawnSync(argv[0], argv.slice(1), { - cwd: wsDir, - encoding: 'utf8', - }); - if (p.error) { - throw p.error; - } else if (p.status !== 0) { - const err = Error(`'npm install' failed (status=${p.status})`); - err.cwd = wsDir; - err.argv = argv; - err.process = p; - throw err; - } - } - } - }); -} - -function main() { - alignSemconvDeps({dryRun: false}); -} - -main(); diff --git a/semantic-conventions/README.md b/semantic-conventions/README.md index 450bbd81275..da7bc0b472c 100644 --- a/semantic-conventions/README.md +++ b/semantic-conventions/README.md @@ -95,7 +95,7 @@ Occasionally, one should review changes to `@opentelemetry/semantic-conventions` A considered alternative for using unstable exports is to **pin** the version. I.e., depend on an exact version, rather than on a version range. ```bash -npm install --save-exact @opentelemetry/semantic-conventions +npm install --save-exact @opentelemetry/semantic-conventions # Don't do this. ``` Then, import directly from `@opentelemetry/semantic-conventions/incubating`.