Merge branch 'main' into fix/opencensus-example

open-telemetry · Jun 26, 2023 · 1bc0aa3 · 1bc0aa3
2 parents b910611 + 4dc8416
commit 1bc0aa3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.esm.json
@@ -12,6 +12,9 @@
     {
       "path": "../../../packages/opentelemetry-core"
     },
+    {
+      "path": "../../../packages/opentelemetry-resources"
+    },
     {
       "path": "../api-logs"
     },

diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.esnext.json
@@ -12,6 +12,9 @@
     {
       "path": "../../../packages/opentelemetry-core"
     },
+    {
+      "path": "../../../packages/opentelemetry-resources"
+    },
     {
       "path": "../api-logs"
     },

diff --git a/experimental/packages/exporter-logs-otlp-http/tsconfig.json b/experimental/packages/exporter-logs-otlp-http/tsconfig.json
@@ -12,6 +12,9 @@
     {
       "path": "../../../packages/opentelemetry-core"
     },
+    {
+      "path": "../../../packages/opentelemetry-resources"
+    },
     {
       "path": "../api-logs"
     },
@@ -23,9 +26,6 @@
     },
     {
       "path": "../sdk-logs"
-    },
-    {
-      "path": "../../../packages/opentelemetry-resources"
-    },
+    }
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,9 @@ @@
         {
           "path": "../../../packages/opentelemetry-core"
         },
+        {
+          "path": "../../../packages/opentelemetry-resources"
+        },
         {
           "path": "../api-logs"
         },
@@ Expand Down @@