From e0abcc0b3fe49545a7d0a62825e9f9399c178f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <deb2001-github@yahoo.de>
Date: Fri, 27 Jan 2023 18:59:50 +0100
Subject: [PATCH] fix: remove JSON syntax error and regenerate tsconfig files
 (#3566)

* chore: regenerate tsconfig files

* fix: add generated js files back to proto base esnext

* Changelog

---------

Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
---
 experimental/CHANGELOG.md                         |  2 ++
 .../exporter-trace-otlp-proto/tsconfig.esm.json   | 15 +++++++++++++++
 .../tsconfig.esnext.json                          | 15 +++++++++++++++
 .../otlp-proto-exporter-base/tsconfig.esm.json    |  3 +++
 .../otlp-proto-exporter-base/tsconfig.esnext.json |  5 ++++-
 tsconfig.esm.json                                 |  6 ++++++
 tsconfig.esnext.json                              |  6 ++++++
 7 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
index 40f2bcbbfa..57eccab24b 100644
--- a/experimental/CHANGELOG.md
+++ b/experimental/CHANGELOG.md
@@ -10,6 +10,8 @@ All notable changes to experimental packages in this project will be documented
 
 ### :bug: (Bug Fix)
 
+* fix: remove JSON syntax error and regenerate tsconfig files [#3566](https://github.com/open-telemetry/opentelemetry-js/pull/3566) @Flarna
+  * Fixes an error where the generated JS files were not included in the esnext package due to a failure of the tsconfig generation
 * fix(sdk-node): register instrumentations early [#3502](https://github.com/open-telemetry/opentelemetry-js/pull/3502) @flarna
 * fix: include tracestate in export [#3569](https://github.com/open-telemetry/opentelemetry-js/pull/3569) @flarna
 
diff --git a/experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json b/experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json
index ae47403334..22887f7b0a 100644
--- a/experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json
+++ b/experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json
@@ -14,6 +14,21 @@
     },
     {
       "path": "../../../packages/opentelemetry-core"
+    },
+    {
+      "path": "../../../packages/opentelemetry-resources"
+    },
+    {
+      "path": "../../../packages/opentelemetry-sdk-trace-base"
+    },
+    {
+      "path": "../otlp-exporter-base"
+    },
+    {
+      "path": "../otlp-proto-exporter-base"
+    },
+    {
+      "path": "../otlp-transformer"
     }
   ]
 }
diff --git a/experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json b/experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json
index 5f6cf572d5..199ea3b325 100644
--- a/experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json
+++ b/experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json
@@ -14,6 +14,21 @@
     },
     {
       "path": "../../../packages/opentelemetry-core"
+    },
+    {
+      "path": "../../../packages/opentelemetry-resources"
+    },
+    {
+      "path": "../../../packages/opentelemetry-sdk-trace-base"
+    },
+    {
+      "path": "../otlp-exporter-base"
+    },
+    {
+      "path": "../otlp-proto-exporter-base"
+    },
+    {
+      "path": "../otlp-transformer"
     }
   ]
 }
diff --git a/experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json b/experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json
index ce8637cb82..d5c055a849 100644
--- a/experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json
+++ b/experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json
@@ -16,6 +16,9 @@
     },
     {
       "path": "../../../packages/opentelemetry-core"
+    },
+    {
+      "path": "../otlp-exporter-base"
     }
   ]
 }
diff --git a/experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json b/experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json
index 4a1cb2c30b..2eeda32b24 100644
--- a/experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json
+++ b/experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json
@@ -8,7 +8,7 @@
   },
   "include": [
     "src/**/*.ts",
-    "src/generated/*.js",
+    "src/generated/*.js"
   ],
   "references": [
     {
@@ -16,6 +16,9 @@
     },
     {
       "path": "../../../packages/opentelemetry-core"
+    },
+    {
+      "path": "../otlp-exporter-base"
     }
   ]
 }
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index 3c3cb876dd..afd8742243 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -11,6 +11,9 @@
     {
       "path": "experimental/packages/exporter-trace-otlp-http/tsconfig.esm.json"
     },
+    {
+      "path": "experimental/packages/exporter-trace-otlp-proto/tsconfig.esm.json"
+    },
     {
       "path": "experimental/packages/opentelemetry-browser-detector/tsconfig.esm.json"
     },
@@ -29,6 +32,9 @@
     {
       "path": "experimental/packages/otlp-exporter-base/tsconfig.esm.json"
     },
+    {
+      "path": "experimental/packages/otlp-proto-exporter-base/tsconfig.esm.json"
+    },
     {
       "path": "experimental/packages/otlp-transformer/tsconfig.esm.json"
     },
diff --git a/tsconfig.esnext.json b/tsconfig.esnext.json
index 63c1e27aa4..c826225f26 100644
--- a/tsconfig.esnext.json
+++ b/tsconfig.esnext.json
@@ -11,6 +11,9 @@
     {
       "path": "experimental/packages/exporter-trace-otlp-http/tsconfig.esnext.json"
     },
+    {
+      "path": "experimental/packages/exporter-trace-otlp-proto/tsconfig.esnext.json"
+    },
     {
       "path": "experimental/packages/opentelemetry-browser-detector/tsconfig.esnext.json"
     },
@@ -29,6 +32,9 @@
     {
       "path": "experimental/packages/otlp-exporter-base/tsconfig.esnext.json"
     },
+    {
+      "path": "experimental/packages/otlp-proto-exporter-base/tsconfig.esnext.json"
+    },
     {
       "path": "experimental/packages/otlp-transformer/tsconfig.esnext.json"
     },