From d875a6e62fe34cdc0d99e5c7c86a1ba9b9f5a8e3 Mon Sep 17 00:00:00 2001
From: Alex Layton <alex@layton.in>
Date: Thu, 21 Nov 2024 15:48:35 -0500
Subject: [PATCH] fix(prom): only use one version of lib-prom

---
 package.json |  1 +
 yarn.lock    | 43 ++-----------------------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index 27f14f3..035b3f0 100644
--- a/package.json
+++ b/package.json
@@ -130,6 +130,7 @@
     "update-browserslist-db": "^1.1.1"
   },
   "resolutions": {
+    "@oada/lib-prom": "^4.0.1",
     "cross-spawn": "^7.0.5",
     "jsonpath-plus": "^10.0.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
diff --git a/yarn.lock b/yarn.lock
index c5b9ca0..8c2c754 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -537,21 +537,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oada/lib-config@npm:^3.7.0":
-  version: 3.9.1
-  resolution: "@oada/lib-config@npm:3.9.1"
-  dependencies:
-    convict: "npm:^6.2.4"
-    convict-format-with-moment: "npm:^6.2.0"
-    convict-format-with-validator: "npm:^6.2.0"
-    dotenv: "npm:^16.0.3"
-    json5: "npm:^2.2.3"
-    tslib: "npm:^2.5.0"
-    yaml: "npm:^2.2.1"
-  checksum: 10/596fde472e08c1444cd241d85d927673e11b801edb205cb30194e7b85b2eef124a25c0a41c4a4e9a12b6d083569c148922e0728ed2e6464fc9b213fa26514821
-  languageName: node
-  linkType: hard
-
 "@oada/lib-config@npm:^4.0.0":
   version: 4.0.0
   resolution: "@oada/lib-config@npm:4.0.0"
@@ -572,21 +557,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oada/lib-prom@npm:^3.8.0":
-  version: 3.8.0
-  resolution: "@oada/lib-prom@npm:3.8.0"
-  dependencies:
-    "@oada/lib-config": "npm:^3.7.0"
-    nstats: "npm:^5.0.0"
-    prom-client: "npm:^14.2.0"
-    tslib: "npm:^2.5.0"
-  dependenciesMeta:
-    nstats:
-      optional: true
-  checksum: 10/2f265f4bdbae6d57165a91cf9868e56a01c7d8a89c432f9e0044045b74eff39699b77aef786646b52e9a2dc5d70d5b74d8e74d2b2b26894e682afa3863ad5e91
-  languageName: node
-  linkType: hard
-
 "@oada/lib-prom@npm:^4.0.1":
   version: 4.0.1
   resolution: "@oada/lib-prom@npm:4.0.1"
@@ -2765,7 +2735,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dotenv@npm:^16.0.3, dotenv@npm:^16.3.1, dotenv@npm:^16.4.5":
+"dotenv@npm:^16.3.1, dotenv@npm:^16.4.5":
   version: 16.4.5
   resolution: "dotenv@npm:16.4.5"
   checksum: 10/55a3134601115194ae0f924e54473459ed0d9fc340ae610b676e248cca45aa7c680d86365318ea964e6da4e2ea80c4514c1adab5adb43d6867fb57ff068f95c8
@@ -6362,15 +6332,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prom-client@npm:^14.2.0":
-  version: 14.2.0
-  resolution: "prom-client@npm:14.2.0"
-  dependencies:
-    tdigest: "npm:^0.1.1"
-  checksum: 10/892eb83eb860945f3ee55bc19bb73e4a64cb63d95e28336141f49fb90a05354765b4ac4a8ba046fd895690f0bf231de1289caf180647cefdfd0d767f34725d97
-  languageName: node
-  linkType: hard
-
 "prom-client@npm:^15.1.3":
   version: 15.1.3
   resolution: "prom-client@npm:15.1.3"
@@ -7921,7 +7882,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.2.1, yaml@npm:^2.5.1":
+"yaml@npm:^2.5.1":
   version: 2.6.0
   resolution: "yaml@npm:2.6.0"
   bin: