Merge branch 'main' into jamie.otlp-user-agent

open-telemetry · May 12, 2023 · 43b223f · 43b223f
2 parents fa4426c + 29c46ef
commit 43b223f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -14,6 +14,8 @@ All notable changes to experimental packages in this project will be documented
 
 ### :bug: (Bug Fix)
 
+fix(otlp-transformer): move api-logs to dependencies [#3798](https://github.com/open-telemetry/opentelemetry-js/pull/3798) @pichlermarc
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)

diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json
@@ -52,8 +52,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "@opentelemetry/api": ">=1.3.0 <1.5.0",
-    "@opentelemetry/api-logs": "0.39.0"
+    "@opentelemetry/api": ">=1.3.0 <1.5.0"
   },
   "devDependencies": {
     "@opentelemetry/api": "1.4.1",
@@ -78,6 +77,7 @@
   "dependencies": {
     "@opentelemetry/core": "1.13.0",
     "@opentelemetry/resources": "1.13.0",
+    "@opentelemetry/api-logs": "0.39.0",
     "@opentelemetry/sdk-logs": "0.39.0",
     "@opentelemetry/sdk-metrics": "1.13.0",
     "@opentelemetry/sdk-trace-base": "1.13.0"

diff --git a/scripts/peer-api-check.js b/scripts/peer-api-check.js
@@ -24,7 +24,7 @@ const appRoot = process.cwd();
 const packageJsonUrl = path.resolve(`${appRoot}/package.json`);
 const pjson = require(packageJsonUrl);
 
-const needCheckPackages = ['@opentelemetry/api', '@opentelemetry/api-logs'];
+const needCheckPackages = ['@opentelemetry/api'];
 
 function checkPackage(package) {
   if (pjson.dependencies && pjson.dependencies[package])