Merge branch 'main' into fix/unexpected-root-path-added

open-telemetry · Sep 30, 2022 · 5c92d23 · 5c92d23
2 parents 7595fc1 + e91cac5
commit 5c92d23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to experimental packages in this project will be documented
 
 ### :bug: (Bug Fix)
 
+* fix(node-sdk): move `@opentelemetry/semantic-conventions` to `dependencies` [#3283](https://github.com/open-telemetry/opentelemetry-js/pull/3283) @mhassan1
 * fix(exporters): do not append trailing '/' when URL contains path [#3274](https://github.com/open-telemetry/opentelemetry-js/pull/3274) @pichlermarc
 
 ### :books: (Refine Doc)

diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json
@@ -55,15 +55,15 @@
     "@opentelemetry/resources": "1.7.0",
     "@opentelemetry/sdk-metrics": "0.33.0",
     "@opentelemetry/sdk-trace-base": "1.7.0",
-    "@opentelemetry/sdk-trace-node": "1.7.0"
+    "@opentelemetry/sdk-trace-node": "1.7.0",
+    "@opentelemetry/semantic-conventions": "1.7.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": ">=1.0.0 <1.3.0"
   },
   "devDependencies": {
     "@opentelemetry/api": ">=1.0.0 <1.3.0",
     "@opentelemetry/context-async-hooks": "1.7.0",
-    "@opentelemetry/semantic-conventions": "1.7.0",
     "@types/mocha": "9.1.1",
     "@types/node": "18.6.5",
     "@types/semver": "7.3.9",