diff --git a/.github/workflows/create-or-update-release-pr.yml b/.github/workflows/create-or-update-release-pr.yml index e6d62d79ba1..9d701cc6fc0 100644 --- a/.github/workflows/create-or-update-release-pr.yml +++ b/.github/workflows/create-or-update-release-pr.yml @@ -13,9 +13,10 @@ on: type: choice description: Release Scope options: - - experimental - - sdk - - all + - experimental # all packages in experimental/packages + - sdk # all SDK packages, experimental and stable, excluding semantic conventions + - all # all release packages, including API, excluding semconv + - semconv # only semantic convention package jobs: create-or-update-release-pr: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d7493899a8..cde506c375b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. For API changes, see the [API CHANGELOG](api/CHANGELOG.md). For experimental package changes, see the [experimental CHANGELOG](experimental/CHANGELOG.md). +For semantic convention package changes, see the [semconv CHANGELOG](packages/semantic-conventions/CHANGELOG.md). ## Unreleased @@ -16,6 +17,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ * feat(semconv): update semantic conventions to 1.27 (from 1.7.0) [#4690](https://github.com/open-telemetry/opentelemetry-js/pull/4690) @dyladan * Exported names have changed to `ATTR_{name}` for attributes (e.g. `ATTR_HTTP_REQUEST_METHOD`), `{name}_VALUE_{value}` for enumeration values (e.g. `HTTP_REQUEST_METHOD_VALUE_POST`), and `METRIC_{name}` for metrics. Exported names from previous versions are deprecated. * Import `@opentelemetry/semantic-conventions` for *stable* semantic conventions. Import `@opentelemetry/semantic-conventions/incubating` for all semantic conventions, stable and unstable. + * Note: Semantic conventions are now versioned separately from other stable artifacts, to correspond to the version of semantic conventions they provide. Changes will be in a separate changelog. ### :bug: (Bug Fix) diff --git a/doc/contributing/releasing.md b/doc/contributing/releasing.md index 9bbeec2423a..4a48995431c 100644 --- a/doc/contributing/releasing.md +++ b/doc/contributing/releasing.md @@ -11,7 +11,8 @@ We aim to eventually automate this process as much as possible. 4. For `Release Scope`, select if you want to release - `experimental` (all packages under `./experimental/packages`) - `sdk` (all packages under `./packages/` and `./experimental/packages`) - - `all` (all packages under `./api/`, `./packages/` and `./experimental/packages`) + - `all` (all packages under `./api/`, `./packages/` and `./experimental/packages`; excludes `./semantic-conventions/`) + - `semconv` (the single semconv package at `./semantic-conventions/`) > [!TIP] > If there was a commit to `main`, after PR creation simply run the workflow again before merging it. @@ -53,6 +54,7 @@ We aim to eventually automate this process as much as possible. 2. Run - `npm run _github:draft_release:experimental`, if you published an `all`, `sdk` or `experimental` release - `npm run _github:draft_release:stable`, if you published an `all` or `sdk` release + - `npm run _github:draft_release:semconv`, if you published a `semconv` release - `npm run _github:draft_release:api` if you published an `all` release 3. Verify that the contents of the created draft releases (title, changelog, selected commit) 4. Publish the releases diff --git a/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json b/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json index a58f4cd3bde..9eaecb65975 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json @@ -19,10 +19,10 @@ "path": "../../../packages/opentelemetry-resources" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../packages/sdk-metrics" }, { - "path": "../../../packages/sdk-metrics" + "path": "../../../semantic-conventions" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json index bdaa95d3ed8..1d09ef3a88b 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json @@ -28,7 +28,7 @@ "path": "../../../packages/opentelemetry-sdk-trace-web" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../semantic-conventions" }, { "path": "../opentelemetry-instrumentation" diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json index 825401c45ec..109b8a40b31 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json @@ -28,7 +28,7 @@ "path": "../../../packages/opentelemetry-sdk-trace-web" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../semantic-conventions" }, { "path": "../opentelemetry-instrumentation" diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json index d531cbbb411..856652db4c1 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json @@ -29,7 +29,7 @@ "path": "../../../packages/opentelemetry-sdk-trace-web" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../semantic-conventions" }, { "path": "../opentelemetry-instrumentation" diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json index 8f10d906d19..bca06f77e4a 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json @@ -25,7 +25,7 @@ "path": "../../../packages/opentelemetry-sdk-trace-node" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../semantic-conventions" }, { "path": "../opentelemetry-instrumentation" diff --git a/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json index 7b14448a30d..a57d906b761 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json @@ -25,10 +25,10 @@ "path": "../../../packages/opentelemetry-sdk-trace-node" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../packages/sdk-metrics" }, { - "path": "../../../packages/sdk-metrics" + "path": "../../../semantic-conventions" }, { "path": "../opentelemetry-instrumentation" diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json index bdaa95d3ed8..1d09ef3a88b 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json @@ -28,7 +28,7 @@ "path": "../../../packages/opentelemetry-sdk-trace-web" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../semantic-conventions" }, { "path": "../opentelemetry-instrumentation" diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json index 825401c45ec..109b8a40b31 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json @@ -28,7 +28,7 @@ "path": "../../../packages/opentelemetry-sdk-trace-web" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../semantic-conventions" }, { "path": "../opentelemetry-instrumentation" diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json index d531cbbb411..856652db4c1 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json @@ -29,7 +29,7 @@ "path": "../../../packages/opentelemetry-sdk-trace-web" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../semantic-conventions" }, { "path": "../opentelemetry-instrumentation" diff --git a/experimental/packages/opentelemetry-sdk-node/tsconfig.json b/experimental/packages/opentelemetry-sdk-node/tsconfig.json index f04c9fdb8e6..07232313f06 100644 --- a/experimental/packages/opentelemetry-sdk-node/tsconfig.json +++ b/experimental/packages/opentelemetry-sdk-node/tsconfig.json @@ -34,10 +34,10 @@ "path": "../../../packages/opentelemetry-sdk-trace-node" }, { - "path": "../../../packages/opentelemetry-semantic-conventions" + "path": "../../../packages/sdk-metrics" }, { - "path": "../../../packages/sdk-metrics" + "path": "../../../semantic-conventions" }, { "path": "../api-logs" diff --git a/package-lock.json b/package-lock.json index 023c8763fb4..03d754ec012 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "workspaces": [ "api", "packages/*", + "semantic-conventions", "experimental/packages/*", "experimental/examples/*", "experimental/backwards-compatibility/*", @@ -7342,7 +7343,7 @@ "link": true }, "node_modules/@opentelemetry/semantic-conventions": { - "resolved": "packages/opentelemetry-semantic-conventions", + "resolved": "semantic-conventions", "link": true }, "node_modules/@opentelemetry/shim-opencensus": { @@ -30960,32 +30961,6 @@ } } }, - "packages/opentelemetry-semantic-conventions": { - "name": "@opentelemetry/semantic-conventions", - "version": "1.25.1", - "license": "Apache-2.0", - "devDependencies": { - "@size-limit/file": "^11.0.1", - "@size-limit/time": "^11.0.1", - "@size-limit/webpack": "^11.0.1", - "@types/mocha": "10.0.7", - "@types/node": "18.6.5", - "@types/sinon": "17.0.3", - "codecov": "3.8.3", - "cross-var": "1.1.0", - "lerna": "6.6.2", - "mocha": "10.7.3", - "nock": "13.3.8", - "nyc": "15.1.0", - "sinon": "15.1.2", - "size-limit": "^11.0.1", - "ts-node": "10.9.2", - "typescript": "4.4.4" - }, - "engines": { - "node": ">=14" - } - }, "packages/opentelemetry-shim-opentracing": { "name": "@opentelemetry/shim-opentracing", "version": "1.25.1", @@ -31254,6 +31229,33 @@ } } }, + "packages/semantic-conventions": { + "name": "@opentelemetry/semantic-conventions", + "version": "1.25.1", + "extraneous": true, + "license": "Apache-2.0", + "devDependencies": { + "@size-limit/file": "^11.0.1", + "@size-limit/time": "^11.0.1", + "@size-limit/webpack": "^11.0.1", + "@types/mocha": "10.0.7", + "@types/node": "18.6.5", + "@types/sinon": "17.0.3", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "mocha": "10.7.3", + "nock": "13.3.8", + "nyc": "15.1.0", + "sinon": "15.1.2", + "size-limit": "^11.0.1", + "ts-node": "10.9.2", + "typescript": "4.4.4" + }, + "engines": { + "node": ">=14" + } + }, "packages/template": { "name": "@opentelemetry/template", "version": "1.25.1", @@ -31504,6 +31506,32 @@ "optional": true } } + }, + "semantic-conventions": { + "name": "@opentelemetry/semantic-conventions", + "version": "1.25.1", + "license": "Apache-2.0", + "devDependencies": { + "@size-limit/file": "^11.0.1", + "@size-limit/time": "^11.0.1", + "@size-limit/webpack": "^11.0.1", + "@types/mocha": "10.0.7", + "@types/node": "18.6.5", + "@types/sinon": "17.0.3", + "codecov": "3.8.3", + "cross-var": "1.1.0", + "lerna": "6.6.2", + "mocha": "10.7.3", + "nock": "13.3.8", + "nyc": "15.1.0", + "sinon": "15.1.2", + "size-limit": "^11.0.1", + "ts-node": "10.9.2", + "typescript": "4.4.4" + }, + "engines": { + "node": ">=14" + } } }, "dependencies": { @@ -37251,7 +37279,7 @@ } }, "@opentelemetry/semantic-conventions": { - "version": "file:packages/opentelemetry-semantic-conventions", + "version": "file:semantic-conventions", "requires": { "@size-limit/file": "^11.0.1", "@size-limit/time": "^11.0.1", diff --git a/package.json b/package.json index 9a8decb3aba..66ff9c7abf9 100644 --- a/package.json +++ b/package.json @@ -37,34 +37,42 @@ "maint:regenerate-test-certs": "npm run --if-present --workspaces maint:regenerate-test-certs", "comment_prepare_1": "echo scripts in this section automatically prepare releases. Intended for use by maintainers only.", "comment_prepare_2": "echo experimental preparation scripts only prepare experimental packages", - "prepare_release:experimental:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_stable && npm run _lerna:version_patch && npm run _restore:package-json && npm run _changelog:prepare_experimental", - "prepare_release:experimental:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_stable && npm run _lerna:version_minor && npm run _restore:package-json && npm run _changelog:prepare_experimental", + "prepare_release:experimental:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_semconv && npm run _lerna:remove_stable && npm run _lerna:version_patch && npm run _restore:package-json && npm run _changelog:prepare_experimental", + "prepare_release:experimental:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && npm run _lerna:remove_semconv && npm run _lerna:remove_stable && npm run _lerna:version_minor && npm run _restore:package-json && npm run _changelog:prepare_experimental", "comment_prepare_3": "echo sdk preparation scripts prepare all stable and experimental packages", - "prepare_release:sdk:patch": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && 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:version_minor && npm run _restore:package-json && npm run _changelog:prepare_experimental && npm run _changelog:prepare_stable", - "prepare_release:all:minor": "npm run _check:no_changes && npm run _backup:package-json && npm run _lerna:remove_api && 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", + "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 && 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", "_check:no_changes": "if [ ! -z \"$(git status -uall --porcelain)\" ]; then echo Please ensure all changes are committed; exit 1; fi", "_backup:package-json": "cp package.json package.json.backup", "_restore:package-json": "mv package.json.backup package.json && npm install --package-lock-only", "_lerna:remove_api": "node -e 'var fs=require(\"fs\");var p=require(\"./package.json\");p.workspaces=p.workspaces.filter(p=>p!==\"api\");fs.writeFileSync(\"package.json\",JSON.stringify(p,null,2))'", + "_lerna:remove_semconv": "node -e 'var fs=require(\"fs\");var p=require(\"./package.json\");p.workspaces=p.workspaces.filter(p=>p!==\"semantic-conventions\");fs.writeFileSync(\"package.json\",JSON.stringify(p,null,2))'", + "_lerna:remove_everything_except_semconv": "node -e 'var fs=require(\"fs\");var p=require(\"./package.json\");p.workspaces=p.workspaces.filter(p=>p==\"semantic-conventions\");fs.writeFileSync(\"package.json\",JSON.stringify(p,null,2))'", "_lerna:remove_stable": "node -e 'var fs=require(\"fs\");var p=require(\"./package.json\");p.workspaces=p.workspaces.filter(p=>p!==\"packages/*\");fs.writeFileSync(\"package.json\",JSON.stringify(p,null,2))'", "_lerna:version_patch": "npx lerna version patch --exact --no-git-tag-version --no-push --yes", "_lerna:version_minor": "npx lerna version minor --exact --no-git-tag-version --no-push --yes", "_changelog:prepare_experimental": "node scripts/update-changelog.js ./experimental/CHANGELOG.md ./experimental/packages/", "_changelog:prepare_stable": "node scripts/update-changelog.js ./CHANGELOG.md ./packages/", "_changelog:prepare_api": "node scripts/update-changelog.js ./api/CHANGELOG.md ./api/package.json", + "_changelog:prepare_semconv": "node scripts/update-changelog.js ./semantic-conventions/CHANGELOG.md ./semantic-conventions/package.json", "_changelog:prepare_all": "npm run _changelog:prepare_api && npm run _changelog:prepare_experimental && npm run _changelog:prepare_stable", "_github:draft_release:all": "npm run _github:draft_release:api && _github:draft_release:experimental && _github:draft_release:stable", - "_github:draft_release:api": "node scripts/extract-latest-release-notes.js ./api/CHANGELOG.md && VERSION=$(node scripts/get-version.js ./api/package.json | grep -oP '^\\d+\\.\\d+\\.\\d+$') && gh release create --draft --notes-file ./.tmp/release-notes.md --target main --title api/v$VERSION api/v$VERSION", - "_github:draft_release:experimental": "node scripts/extract-latest-release-notes.js ./experimental/CHANGELOG.md && VERSION=$(node scripts/get-version.js ./experimental/packages/ | grep -oP '^\\d+\\.\\d+\\.\\d+$') && gh release create --draft --notes-file ./.tmp/release-notes.md --target main --title experimental/v$VERSION experimental/v$VERSION", - "_github:draft_release:stable": "node scripts/extract-latest-release-notes.js ./CHANGELOG.md && VERSION=$(node scripts/get-version.js ./packages/ | grep -oP '^\\d+\\.\\d+\\.\\d+$') && gh release create --draft --notes-file ./.tmp/release-notes.md --target main --title v$VERSION v$VERSION", + "_github:draft_release:api": "node scripts/extract-latest-release-notes.js ./api/CHANGELOG.md && VERSION=$(node scripts/get-version.js ./api/package.json | grep -oE '^[0-9]+\\.[0-9]+\\.[0-9]+$') && gh release create --draft --notes-file ./.tmp/release-notes.md --target main --title api/v$VERSION api/v$VERSION", + "_github:draft_release:experimental": "node scripts/extract-latest-release-notes.js ./experimental/CHANGELOG.md && VERSION=$(node scripts/get-version.js ./experimental/packages/ | grep -oE '^[0-9]+\\.[0-9]+\\.[0-9]+$') && gh release create --draft --notes-file ./.tmp/release-notes.md --target main --title experimental/v$VERSION experimental/v$VERSION", + "_github:draft_release:stable": "node scripts/extract-latest-release-notes.js ./CHANGELOG.md && VERSION=$(node scripts/get-version.js ./packages/ | grep -oE '^[0-9]+\\.[0-9]+\\.[0-9]+$') && gh release create --draft --notes-file ./.tmp/release-notes.md --target main --title v$VERSION v$VERSION", + "_github:draft_release:semconv": "node scripts/extract-latest-release-notes.js ./semantic-conventions/CHANGELOG.md && VERSION=$(node scripts/get-version.js ./semantic-conventions/package.json | grep -oE '^[0-9]+\\.[0-9]+\\.[0-9]+$') && gh release create --draft --notes-file ./.tmp/release-notes.md --target main --title semconv/v$VERSION semconv/v$VERSION", "_github:update_release_pr_body_from_file": "gh pr edit --repo open-telemetry/opentelemetry-js $RELEASE_PR_OWNER:release/next-version --body-file ./.tmp/release-notes.md", "_github:update_release_pr_body:all": "node scripts/extract-latest-release-notes.js api/CHANGELOG.md ./CHANGELOG.md experimental/CHANGELOG.md && npm run _github:update_release_pr_body_from_file", "_github:update_release_pr_body:sdk": "node scripts/extract-latest-release-notes.js ./CHANGELOG.md experimental/CHANGELOG.md && npm run _github:update_release_pr_body_from_file", "_github:update_release_pr_body:experimental": "node scripts/extract-latest-release-notes.js experimental/CHANGELOG.md && npm run _github:update_release_pr_body_from_file", - "_verify_release_kind": "echo $RELEASE_KIND | grep -oP '^(all|sdk|experimental):(minor|patch)$'", + "_github:update_release_pr_body:semconv": "node scripts/extract-latest-release-notes.js semantic-conventions/CHANGELOG.md && npm run _github:update_release_pr_body_from_file", + "_verify_release_kind": "echo $RELEASE_KIND | grep -oE '^(all|sdk|experimental|semconv):(minor|patch)$'", "_verify_release_remote": "git remote get-url $RELEASE_PR_REMOTE", "_github:update_release_branch": "npm run _verify_release_kind && npm run _verify_release_remote && (git checkout main && git pull upstream main && git branch -D release/next-version; git checkout -b release/next-version && npm run prepare_release:$RELEASE_KIND && git commit -am \"chore: prepare release\" && git push --set-upstream $RELEASE_PR_REMOTE --force release/next-version)", "github:create_or_update_release_pr": "npm run _github:update_release_branch && (gh pr create --repo open-telemetry/opentelemetry-js --title 'chore: prepare next release' --body ''; npm run _github:update_release_pr_body:$RELEASE_SCOPE)" @@ -125,6 +133,7 @@ "workspaces": [ "api", "packages/*", + "semantic-conventions", "experimental/packages/*", "experimental/examples/*", "experimental/backwards-compatibility/*", diff --git a/packages/opentelemetry-core/tsconfig.esm.json b/packages/opentelemetry-core/tsconfig.esm.json index fdabf4b57f9..5edc2ab7045 100644 --- a/packages/opentelemetry-core/tsconfig.esm.json +++ b/packages/opentelemetry-core/tsconfig.esm.json @@ -13,7 +13,7 @@ "path": "../../api" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../../semantic-conventions" } ] } diff --git a/packages/opentelemetry-core/tsconfig.esnext.json b/packages/opentelemetry-core/tsconfig.esnext.json index 3d3cb45fd0e..137155dc3f8 100644 --- a/packages/opentelemetry-core/tsconfig.esnext.json +++ b/packages/opentelemetry-core/tsconfig.esnext.json @@ -13,7 +13,7 @@ "path": "../../api" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../../semantic-conventions" } ] } diff --git a/packages/opentelemetry-core/tsconfig.json b/packages/opentelemetry-core/tsconfig.json index 9c47daec705..b23a40dda81 100644 --- a/packages/opentelemetry-core/tsconfig.json +++ b/packages/opentelemetry-core/tsconfig.json @@ -14,7 +14,7 @@ "path": "../../api" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../../semantic-conventions" } ] } diff --git a/packages/opentelemetry-exporter-jaeger/tsconfig.json b/packages/opentelemetry-exporter-jaeger/tsconfig.json index a23aa22bd24..c2e006e251d 100644 --- a/packages/opentelemetry-exporter-jaeger/tsconfig.json +++ b/packages/opentelemetry-exporter-jaeger/tsconfig.json @@ -12,6 +12,9 @@ { "path": "../../api" }, + { + "path": "../../semantic-conventions" + }, { "path": "../opentelemetry-core" }, @@ -20,9 +23,6 @@ }, { "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json b/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json index 56cf35eea08..cea65e36902 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json @@ -12,6 +12,9 @@ { "path": "../../api" }, + { + "path": "../../semantic-conventions" + }, { "path": "../opentelemetry-core" }, @@ -20,9 +23,6 @@ }, { "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json b/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json index 5d9a60ea20b..bb60bd24850 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json @@ -12,6 +12,9 @@ { "path": "../../api" }, + { + "path": "../../semantic-conventions" + }, { "path": "../opentelemetry-core" }, @@ -20,9 +23,6 @@ }, { "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.json b/packages/opentelemetry-exporter-zipkin/tsconfig.json index c8b602f0e09..9db1d26cb2e 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.json @@ -13,6 +13,9 @@ { "path": "../../api" }, + { + "path": "../../semantic-conventions" + }, { "path": "../opentelemetry-core" }, @@ -21,9 +24,6 @@ }, { "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-resources/README.md b/packages/opentelemetry-resources/README.md index 00b684ec319..3b19855adff 100644 --- a/packages/opentelemetry-resources/README.md +++ b/packages/opentelemetry-resources/README.md @@ -5,7 +5,7 @@ The OpenTelemetry Resource is an immutable representation of the entity producing telemetry. For example, a process producing telemetry that is running in a container on Kubernetes has a Pod name, it is in a namespace and possibly is part of a Deployment which also has a name. All three of these attributes can be included in the `Resource`. -[This document][resource-semantic_conventions] defines standard attributes for resources which are accessible via [`@opentelemetry/semantic-conventions`](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions). +[This document][resource-semantic_conventions] defines standard attributes for resources which are accessible via [`@opentelemetry/semantic-conventions`](https://github.com/open-telemetry/opentelemetry-js/tree/main/semantic-conventions). ## Installation diff --git a/packages/opentelemetry-resources/tsconfig.esm.json b/packages/opentelemetry-resources/tsconfig.esm.json index dc247ea71d1..c2f930c6924 100644 --- a/packages/opentelemetry-resources/tsconfig.esm.json +++ b/packages/opentelemetry-resources/tsconfig.esm.json @@ -13,10 +13,10 @@ "path": "../../api" }, { - "path": "../opentelemetry-core" + "path": "../../semantic-conventions" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-core" } ] } diff --git a/packages/opentelemetry-resources/tsconfig.esnext.json b/packages/opentelemetry-resources/tsconfig.esnext.json index df87d6341a1..abbd06192ae 100644 --- a/packages/opentelemetry-resources/tsconfig.esnext.json +++ b/packages/opentelemetry-resources/tsconfig.esnext.json @@ -13,10 +13,10 @@ "path": "../../api" }, { - "path": "../opentelemetry-core" + "path": "../../semantic-conventions" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-core" } ] } diff --git a/packages/opentelemetry-resources/tsconfig.json b/packages/opentelemetry-resources/tsconfig.json index 873053f076f..19b22eebc3d 100644 --- a/packages/opentelemetry-resources/tsconfig.json +++ b/packages/opentelemetry-resources/tsconfig.json @@ -14,10 +14,10 @@ "path": "../../api" }, { - "path": "../opentelemetry-core" + "path": "../../semantic-conventions" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-core" } ] } diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json b/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json index 8c54819c4f9..784ec6d5ab8 100644 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json @@ -13,13 +13,13 @@ "path": "../../api" }, { - "path": "../opentelemetry-core" + "path": "../../semantic-conventions" }, { - "path": "../opentelemetry-resources" + "path": "../opentelemetry-core" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-resources" } ] } diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json b/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json index 5ec46d31561..784ffcc8264 100644 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json @@ -13,13 +13,13 @@ "path": "../../api" }, { - "path": "../opentelemetry-core" + "path": "../../semantic-conventions" }, { - "path": "../opentelemetry-resources" + "path": "../opentelemetry-core" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-resources" } ] } diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.json b/packages/opentelemetry-sdk-trace-base/tsconfig.json index 2d87ab62f91..17e40e21a32 100644 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.json @@ -14,13 +14,13 @@ "path": "../../api" }, { - "path": "../opentelemetry-core" + "path": "../../semantic-conventions" }, { - "path": "../opentelemetry-resources" + "path": "../opentelemetry-core" }, { - "path": "../opentelemetry-semantic-conventions" + "path": "../opentelemetry-resources" } ] } diff --git a/packages/opentelemetry-sdk-trace-node/tsconfig.json b/packages/opentelemetry-sdk-trace-node/tsconfig.json index 31559ba9b3b..60f86e96760 100644 --- a/packages/opentelemetry-sdk-trace-node/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-node/tsconfig.json @@ -12,6 +12,9 @@ { "path": "../../api" }, + { + "path": "../../semantic-conventions" + }, { "path": "../opentelemetry-context-async-hooks" }, @@ -29,9 +32,6 @@ }, { "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json b/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json index b4393361b56..06c59548508 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json @@ -12,6 +12,9 @@ { "path": "../../api" }, + { + "path": "../../semantic-conventions" + }, { "path": "../opentelemetry-context-zone" }, @@ -26,9 +29,6 @@ }, { "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json b/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json index db7a907a82e..7f20b27d313 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json @@ -12,6 +12,9 @@ { "path": "../../api" }, + { + "path": "../../semantic-conventions" + }, { "path": "../opentelemetry-context-zone" }, @@ -26,9 +29,6 @@ }, { "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.json b/packages/opentelemetry-sdk-trace-web/tsconfig.json index 1219036168e..f8405885b0b 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.json @@ -13,6 +13,9 @@ { "path": "../../api" }, + { + "path": "../../semantic-conventions" + }, { "path": "../opentelemetry-context-zone" }, @@ -27,9 +30,6 @@ }, { "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/packages/opentelemetry-shim-opentracing/tsconfig.json b/packages/opentelemetry-shim-opentracing/tsconfig.json index 7b5f7d36715..cada43edfd5 100644 --- a/packages/opentelemetry-shim-opentracing/tsconfig.json +++ b/packages/opentelemetry-shim-opentracing/tsconfig.json @@ -12,6 +12,9 @@ { "path": "../../api" }, + { + "path": "../../semantic-conventions" + }, { "path": "../opentelemetry-core" }, @@ -23,9 +26,6 @@ }, { "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" } ] } diff --git a/scripts/extract-latest-release-notes.js b/scripts/extract-latest-release-notes.js index 45e8885408c..f7022609d1c 100644 --- a/scripts/extract-latest-release-notes.js +++ b/scripts/extract-latest-release-notes.js @@ -6,6 +6,7 @@ * - node scripts/extract-latest-release-notes.js [PATH TO CHANGELOG]... * Examples: * - node scripts/extract-latest-release-notes.js ./packages/CHANGELOG.md + * - node scripts/extract-latest-release-notes.js ./semantic-conventions/CHANGELOG.md * - node scripts/extract-latest-release-notes.js ./experimental/CHANGELOG.md * - node scripts/extract-latest-release-notes.js ./api/CHANGELOG.md ./packages/CHANGELOG.md ./experimental/CHANGELOG.md */ @@ -15,16 +16,17 @@ const fs = require('fs'); function extractLatestChangelog(changelogPath) { const changelog = fs.readFileSync(changelogPath).toString(); // Matches everything from the first entry at h2 ('##') followed by a space and a non-prerelease semver version - // until the next entry at h2. - const firstReleaseNoteEntryExp = /^## \d+\.\d+\.\d\n.*?(?=^## )/ms; + // until the next entry at h2 or the end of the file (useful for first entry). + // Thanks to https://stackoverflow.com/a/34958727 for the /Z emulation + const firstReleaseNoteEntryExp = /^## \d+\.\d+\.\d\n.*?((?=^## )|$(?![\r\n]))/ms; return changelog.match(firstReleaseNoteEntryExp)[0]; -} +}; fs.mkdirSync('./.tmp/', { recursive: true }); -const notesFile = './.tmp/release-notes.md' +const notesFile = './.tmp/release-notes.md'; const changelogFilePaths = process.argv.slice(2); fs.writeFileSync(notesFile, changelogFilePaths.map(filePath => extractLatestChangelog(filePath)).join('\n')); diff --git a/scripts/semconv/generate.sh b/scripts/semconv/generate.sh index 9783b3552d9..90bcb339355 100755 --- a/scripts/semconv/generate.sh +++ b/scripts/semconv/generate.sh @@ -28,7 +28,7 @@ cd ${SCRIPT_DIR} docker run --rm --platform linux/amd64 \ -v ${SCRIPT_DIR}/semantic-conventions/model:/source \ -v ${SCRIPT_DIR}/templates:/weaver/templates \ - -v ${ROOT_DIR}/packages/opentelemetry-semantic-conventions/src/:/output \ + -v ${ROOT_DIR}/semantic-conventions/src/:/output \ otel/weaver:$GENERATOR_VERSION \ registry generate \ --registry=/source \ @@ -37,5 +37,5 @@ docker run --rm --platform linux/amd64 \ /output/ # Ensure semconv compiles -cd "${ROOT_DIR}/packages/opentelemetry-semantic-conventions" +cd "${ROOT_DIR}/semantic-conventions" npm run compile diff --git a/scripts/update-changelog.js b/scripts/update-changelog.js index d4ec4a6d8ab..f10b75efb24 100644 --- a/scripts/update-changelog.js +++ b/scripts/update-changelog.js @@ -1,5 +1,5 @@ /** - * This script updates changelogs after lerna has updated versions in the respective areas (packages/*, experimental/packages/*, api/) + * This script updates changelogs after lerna has updated versions in the respective areas (packages/*, experimental/packages/*, api/, semantic-conventions/) * - removes all empty subsections (bugs, enhancements, etc.) in the changelog. * - replaces the "Unreleased"-header with the version from the first non-private package in the directory (versions are expected to be uniform across a changelog) * - adds a new "Unreleased"-header with empty subsections at the top diff --git a/packages/opentelemetry-semantic-conventions/.eslintignore b/semantic-conventions/.eslintignore similarity index 100% rename from packages/opentelemetry-semantic-conventions/.eslintignore rename to semantic-conventions/.eslintignore diff --git a/packages/opentelemetry-semantic-conventions/.eslintrc.js b/semantic-conventions/.eslintrc.js similarity index 100% rename from packages/opentelemetry-semantic-conventions/.eslintrc.js rename to semantic-conventions/.eslintrc.js diff --git a/packages/opentelemetry-semantic-conventions/.npmignore b/semantic-conventions/.npmignore similarity index 100% rename from packages/opentelemetry-semantic-conventions/.npmignore rename to semantic-conventions/.npmignore diff --git a/semantic-conventions/CHANGELOG.md b/semantic-conventions/CHANGELOG.md new file mode 100644 index 00000000000..4a67fdfcdd4 --- /dev/null +++ b/semantic-conventions/CHANGELOG.md @@ -0,0 +1,22 @@ + +# CHANGELOG + +All notable changes to the semantic-conventions package will be documented in this file. + +## Unreleased + +Note: This package will now be versioned according to the version of semantic conventions being provided. + +### :boom: Breaking Change + +### :rocket: (Enhancement) + +* feat(semconv): update semantic conventions to 1.27 (from 1.7.0) [#4690](https://github.com/open-telemetry/opentelemetry-js/pull/4690) @dyladan + * Exported names have changed to `ATTR_{name}` for attributes (e.g. `ATTR_HTTP_REQUEST_METHOD`), `{name}_VALUE_{value}` for enumeration values (e.g. `HTTP_REQUEST_METHOD_VALUE_POST`), and `METRIC_{name}` for metrics. Exported names from previous versions are deprecated. + * Import `@opentelemetry/semantic-conventions` for *stable* semantic conventions. Import `@opentelemetry/semantic-conventions/incubating` for all semantic conventions, stable and unstable. + +### :bug: (Bug Fix) + +### :books: (Refine Doc) + +### :house: (Internal) diff --git a/packages/opentelemetry-semantic-conventions/LICENSE b/semantic-conventions/LICENSE similarity index 100% rename from packages/opentelemetry-semantic-conventions/LICENSE rename to semantic-conventions/LICENSE diff --git a/packages/opentelemetry-semantic-conventions/README.md b/semantic-conventions/README.md similarity index 100% rename from packages/opentelemetry-semantic-conventions/README.md rename to semantic-conventions/README.md diff --git a/packages/opentelemetry-semantic-conventions/package.json b/semantic-conventions/package.json similarity index 91% rename from packages/opentelemetry-semantic-conventions/package.json rename to semantic-conventions/package.json index 85de1ccd6e4..d56fc4ebb0c 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/semantic-conventions/package.json @@ -35,13 +35,13 @@ "prepublishOnly": "npm run compile", "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", - "version": "node ../../scripts/version-update.js", + "version": "node ../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies", "prewatch": "npm run precompile", - "peer-api-check": "node ../../scripts/peer-api-check.js", + "peer-api-check": "node ../scripts/peer-api-check.js", "size-check": "npm run compile && mocha 'test/**/*.test.ts'", - "align-api-deps": "node ../../scripts/align-api-deps.js" + "align-api-deps": "node ../scripts/align-api-deps.js" }, "keywords": [ "opentelemetry", @@ -90,6 +90,6 @@ "ts-node": "10.9.2", "typescript": "4.4.4" }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions", + "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/semantic-conventions", "sideEffects": false } diff --git a/packages/opentelemetry-semantic-conventions/src/experimental_attributes.ts b/semantic-conventions/src/experimental_attributes.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/experimental_attributes.ts rename to semantic-conventions/src/experimental_attributes.ts diff --git a/packages/opentelemetry-semantic-conventions/src/experimental_metrics.ts b/semantic-conventions/src/experimental_metrics.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/experimental_metrics.ts rename to semantic-conventions/src/experimental_metrics.ts diff --git a/packages/opentelemetry-semantic-conventions/src/index-incubating.ts b/semantic-conventions/src/index-incubating.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/index-incubating.ts rename to semantic-conventions/src/index-incubating.ts diff --git a/packages/opentelemetry-semantic-conventions/src/index.ts b/semantic-conventions/src/index.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/index.ts rename to semantic-conventions/src/index.ts diff --git a/packages/opentelemetry-semantic-conventions/src/internal/utils.ts b/semantic-conventions/src/internal/utils.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/internal/utils.ts rename to semantic-conventions/src/internal/utils.ts diff --git a/packages/opentelemetry-semantic-conventions/src/resource/SemanticResourceAttributes.ts b/semantic-conventions/src/resource/SemanticResourceAttributes.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/resource/SemanticResourceAttributes.ts rename to semantic-conventions/src/resource/SemanticResourceAttributes.ts diff --git a/packages/opentelemetry-semantic-conventions/src/resource/index.ts b/semantic-conventions/src/resource/index.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/resource/index.ts rename to semantic-conventions/src/resource/index.ts diff --git a/packages/opentelemetry-semantic-conventions/src/stable_attributes.ts b/semantic-conventions/src/stable_attributes.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/stable_attributes.ts rename to semantic-conventions/src/stable_attributes.ts diff --git a/packages/opentelemetry-semantic-conventions/src/stable_metrics.ts b/semantic-conventions/src/stable_metrics.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/stable_metrics.ts rename to semantic-conventions/src/stable_metrics.ts diff --git a/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts b/semantic-conventions/src/trace/SemanticAttributes.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts rename to semantic-conventions/src/trace/SemanticAttributes.ts diff --git a/packages/opentelemetry-semantic-conventions/src/trace/index.ts b/semantic-conventions/src/trace/index.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/src/trace/index.ts rename to semantic-conventions/src/trace/index.ts diff --git a/packages/opentelemetry-semantic-conventions/test/helpers/autoImports.ts b/semantic-conventions/test/helpers/autoImports.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/test/helpers/autoImports.ts rename to semantic-conventions/test/helpers/autoImports.ts diff --git a/packages/opentelemetry-semantic-conventions/test/sizeLimit.test.ts b/semantic-conventions/test/sizeLimit.test.ts similarity index 100% rename from packages/opentelemetry-semantic-conventions/test/sizeLimit.test.ts rename to semantic-conventions/test/sizeLimit.test.ts diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.esm.json b/semantic-conventions/tsconfig.esm.json similarity index 81% rename from packages/opentelemetry-semantic-conventions/tsconfig.esm.json rename to semantic-conventions/tsconfig.esm.json index c43ba03ff0b..0817b3decd4 100644 --- a/packages/opentelemetry-semantic-conventions/tsconfig.esm.json +++ b/semantic-conventions/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.esm.json", + "extends": "../tsconfig.base.esm.json", "compilerOptions": { "outDir": "build/esm", "rootDir": "src", diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.esnext.json b/semantic-conventions/tsconfig.esnext.json similarity index 81% rename from packages/opentelemetry-semantic-conventions/tsconfig.esnext.json rename to semantic-conventions/tsconfig.esnext.json index 6eaaaf7d042..54d1d053dcf 100644 --- a/packages/opentelemetry-semantic-conventions/tsconfig.esnext.json +++ b/semantic-conventions/tsconfig.esnext.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.esnext.json", + "extends": "../tsconfig.base.esnext.json", "compilerOptions": { "outDir": "build/esnext", "rootDir": "src", diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.json b/semantic-conventions/tsconfig.json similarity index 80% rename from packages/opentelemetry-semantic-conventions/tsconfig.json rename to semantic-conventions/tsconfig.json index d6e4e25caf7..9622af53cdc 100644 --- a/packages/opentelemetry-semantic-conventions/tsconfig.json +++ b/semantic-conventions/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "outDir": "build", "rootDir": "." diff --git a/tsconfig.esm.json b/tsconfig.esm.json index 98df7143414..07de4a68c5a 100644 --- a/tsconfig.esm.json +++ b/tsconfig.esm.json @@ -83,14 +83,14 @@ { "path": "packages/opentelemetry-sdk-trace-web/tsconfig.esm.json" }, - { - "path": "packages/opentelemetry-semantic-conventions/tsconfig.esm.json" - }, { "path": "packages/propagator-aws-xray/tsconfig.esm.json" }, { "path": "packages/sdk-metrics/tsconfig.esm.json" + }, + { + "path": "semantic-conventions/tsconfig.esm.json" } ] } diff --git a/tsconfig.esnext.json b/tsconfig.esnext.json index 3f4e173799b..2a5c7584bf9 100644 --- a/tsconfig.esnext.json +++ b/tsconfig.esnext.json @@ -83,14 +83,14 @@ { "path": "packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json" }, - { - "path": "packages/opentelemetry-semantic-conventions/tsconfig.esnext.json" - }, { "path": "packages/propagator-aws-xray/tsconfig.esnext.json" }, { "path": "packages/sdk-metrics/tsconfig.esnext.json" + }, + { + "path": "semantic-conventions/tsconfig.esnext.json" } ] } diff --git a/tsconfig.json b/tsconfig.json index 79fda12990f..6ecaefc2244 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -43,10 +43,10 @@ "packages/opentelemetry-sdk-trace-base", "packages/opentelemetry-sdk-trace-node", "packages/opentelemetry-sdk-trace-web", - "packages/opentelemetry-semantic-conventions", "packages/opentelemetry-shim-opentracing", "packages/propagator-aws-xray", - "packages/sdk-metrics" + "packages/sdk-metrics", + "semantic-conventions" ], "out": "docs", "exclude": [ @@ -176,9 +176,6 @@ { "path": "packages/opentelemetry-sdk-trace-web" }, - { - "path": "packages/opentelemetry-semantic-conventions" - }, { "path": "packages/opentelemetry-shim-opentracing" }, @@ -190,6 +187,9 @@ }, { "path": "packages/template" + }, + { + "path": "semantic-conventions" } ] }