Merge 0ef1038 into 3bc93a9

open-telemetry · Jan 27, 2023 · 581b372 · 581b372
2 parents 3bc93a9 + 0ef1038
commit 581b372
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 1 deletion.
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -10,6 +10,9 @@ 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
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)

diff --git 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
@@ -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
@@ -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
@@ -8,14 +8,17 @@
   },
   "include": [
     "src/**/*.ts",
-    "src/generated/*.js",
+    "src/generated/*.js"
   ],
   "references": [
     {
       "path": "../../../api"
     },
     {
       "path": "../../../packages/opentelemetry-core"
+    },
+    {
+      "path": "../otlp-exporter-base"
     }
   ]
 }
diff --git 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
@@ -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"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,9 @@ @@
         },
         {
           "path": "../../../packages/opentelemetry-core"
+        },
+        {
+          "path": "../otlp-exporter-base"
         }
       ]
     }