From f5e227f0cb829df1ca2dc220a3e0e8ae0e607405 Mon Sep 17 00:00:00 2001
From: Daniel Dyla <dyladan@users.noreply.github.com>
Date: Thu, 11 Nov 2021 10:04:27 -0500
Subject: [PATCH] chore: fix compilation errors

---
 .../tsconfig.json                             | 12 ++++++++++
 .../tsconfig.esm.json                         | 11 ++++++++++
 .../tsconfig.json                             | 11 ++++++++++
 .../tsconfig.json                             | 11 +++++++++-
 .../tsconfig.json                             |  6 -----
 .../tsconfig.esm.json                         |  8 -------
 .../tsconfig.json                             |  8 -------
 .../tsconfig.json                             |  6 -----
 .../src/MeterProvider.ts                      |  1 -
 experimental/tsconfig.esm.json                | 15 ++++++++++---
 experimental/tsconfig.json                    | 22 +++++++++----------
 11 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json
index 948abef3ceb..b3ff4e84578 100644
--- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json
+++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json
@@ -11,6 +11,18 @@
   "references": [
     {
       "path": "../opentelemetry-api-metrics"
+    },
+    {
+      "path": "../opentelemetry-exporter-metrics-otlp-http"
+    },
+    {
+      "path": "../opentelemetry-exporter-trace-otlp-grpc"
+    },
+    {
+      "path": "../opentelemetry-exporter-trace-otlp-http"
+    },
+    {
+      "path": "../opentelemetry-sdk-metrics-base"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json
index 379f547a469..484461f470a 100644
--- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json
+++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json
@@ -7,5 +7,16 @@
   },
   "include": [
     "src/**/*.ts"
+  ],
+  "references": [
+    {
+      "path": "../opentelemetry-api-metrics/tsconfig.esm.json"
+    },
+    {
+      "path": "../opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json"
+    },
+    {
+      "path": "../opentelemetry-sdk-metrics-base/tsconfig.esm.json"
+    }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json
index ed9d0830bdd..13dc2e7744d 100644
--- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json
+++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json
@@ -7,5 +7,16 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts"
+  ],
+  "references": [
+    {
+      "path": "../opentelemetry-api-metrics"
+    },
+    {
+      "path": "../opentelemetry-exporter-trace-otlp-http"
+    },
+    {
+      "path": "../opentelemetry-sdk-metrics-base"
+    }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json
index 03a463d6378..35c3f6d9c73 100644
--- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json
+++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json
@@ -10,10 +10,19 @@
   ],
   "references": [
     {
-      "path": "../opentelemetry-sdk-metrics-base"
+      "path": "../opentelemetry-api-metrics"
     },
     {
       "path": "../opentelemetry-exporter-metrics-otlp-http"
+    },
+    {
+      "path": "../opentelemetry-exporter-trace-otlp-http"
+    },
+    {
+      "path": "../opentelemetry-exporter-trace-otlp-proto"
+    },
+    {
+      "path": "../opentelemetry-sdk-metrics-base"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/tsconfig.json b/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/tsconfig.json
index 13dc2e7744d..075a501621d 100644
--- a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/tsconfig.json
+++ b/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/tsconfig.json
@@ -9,14 +9,8 @@
     "test/**/*.ts"
   ],
   "references": [
-    {
-      "path": "../opentelemetry-api-metrics"
-    },
     {
       "path": "../opentelemetry-exporter-trace-otlp-http"
-    },
-    {
-      "path": "../opentelemetry-sdk-metrics-base"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json b/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json
index 7b09613481b..379f547a469 100644
--- a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json
+++ b/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json
@@ -7,13 +7,5 @@
   },
   "include": [
     "src/**/*.ts"
-  ],
-  "references": [
-    {
-      "path": "../opentelemetry-api-metrics/tsconfig.esm.json"
-    },
-    {
-      "path": "../opentelemetry-sdk-metrics-base/tsconfig.esm.json"
-    }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.json b/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.json
index 3c062d3feb2..ed9d0830bdd 100644
--- a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.json
+++ b/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.json
@@ -7,13 +7,5 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts"
-  ],
-  "references": [
-    {
-      "path": "../opentelemetry-api-metrics"
-    },
-    {
-      "path": "../opentelemetry-sdk-metrics-base"
-    }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/tsconfig.json b/experimental/packages/opentelemetry-exporter-trace-otlp-proto/tsconfig.json
index 13dc2e7744d..075a501621d 100644
--- a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/tsconfig.json
+++ b/experimental/packages/opentelemetry-exporter-trace-otlp-proto/tsconfig.json
@@ -9,14 +9,8 @@
     "test/**/*.ts"
   ],
   "references": [
-    {
-      "path": "../opentelemetry-api-metrics"
-    },
     {
       "path": "../opentelemetry-exporter-trace-otlp-http"
-    },
-    {
-      "path": "../opentelemetry-sdk-metrics-base"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts b/experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts
index 392b1699f34..3f4c6078e7d 100644
--- a/experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts
+++ b/experimental/packages/opentelemetry-sdk-metrics-base/src/MeterProvider.ts
@@ -56,7 +56,6 @@ export class MeterProvider implements api.MeterProvider {
         new Meter({
           name,
           version,
-          // @ts-expect-error ts(2345) TODO: upgrade @opentelemetry/core InstrumentationLibrary definition
           schemaUrl: options?.schemaUrl
         }, this._config)
       );
diff --git a/experimental/tsconfig.esm.json b/experimental/tsconfig.esm.json
index d2bedd4f38c..69fc2f94752 100644
--- a/experimental/tsconfig.esm.json
+++ b/experimental/tsconfig.esm.json
@@ -6,17 +6,26 @@
       "path": "packages/opentelemetry-api-metrics/tsconfig.esm.json"
     },
     {
-      "path": "packages/opentelemetry-exporter-trace-otlp-grpc"
+      "path": "packages/opentelemetry-exporter-metrics-otlp-grpc"
     },
     {
-      "path": "packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json"
+      "path": "packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json"
     },
     {
-      "path": "packages/opentelemetry-exporter-trace-otlp-proto"
+      "path": "packages/opentelemetry-exporter-metrics-otlp-proto"
     },
     {
       "path": "packages/opentelemetry-exporter-prometheus"
     },
+    {
+      "path": "packages/opentelemetry-exporter-trace-otlp-grpc"
+    },
+    {
+      "path": "packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json"
+    },
+    {
+      "path": "packages/opentelemetry-exporter-trace-otlp-proto"
+    },
     {
       "path": "packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json"
     },
diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json
index 5a53c080f2b..b741eeff48c 100644
--- a/experimental/tsconfig.json
+++ b/experimental/tsconfig.json
@@ -6,40 +6,40 @@
       "path": "packages/opentelemetry-api-metrics"
     },
     {
-      "path": "packages/opentelemetry-exporter-trace-otlp-grpc"
+      "path": "packages/opentelemetry-exporter-metrics-otlp-grpc"
     },
     {
-      "path": "packages/opentelemetry-exporter-trace-otlp-http"
+      "path": "packages/opentelemetry-exporter-metrics-otlp-http"
     },
     {
-      "path": "packages/opentelemetry-exporter-trace-otlp-proto"
+      "path": "packages/opentelemetry-exporter-metrics-otlp-proto"
     },
     {
       "path": "packages/opentelemetry-exporter-prometheus"
     },
     {
-      "path": "packages/opentelemetry-instrumentation-fetch"
+      "path": "packages/opentelemetry-exporter-trace-otlp-grpc"
     },
     {
-      "path": "packages/opentelemetry-instrumentation-grpc"
+      "path": "packages/opentelemetry-exporter-trace-otlp-http"
     },
     {
-      "path": "packages/opentelemetry-instrumentation-http"
+      "path": "packages/opentelemetry-exporter-trace-otlp-proto"
     },
     {
-      "path": "packages/opentelemetry-instrumentation-xml-http-request"
+      "path": "packages/opentelemetry-instrumentation-fetch"
     },
     {
-      "path": "packages/opentelemetry-instrumentation"
+      "path": "packages/opentelemetry-instrumentation-grpc"
     },
     {
-      "path": "packages/opentelemetry-exporter-metrics-otlp-http"
+      "path": "packages/opentelemetry-instrumentation-http"
     },
     {
-      "path": "packages/opentelemetry-exporter-metrics-otlp-grpc"
+      "path": "packages/opentelemetry-instrumentation-xml-http-request"
     },
     {
-      "path": "packages/opentelemetry-exporter-metrics-otlp-proto"
+      "path": "packages/opentelemetry-instrumentation"
     },
     {
       "path": "packages/opentelemetry-sdk-metrics-base"