From 0a395b3e65e786beb4efeb97fb24179e4d163ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Wed, 14 Feb 2024 10:03:11 +0100
Subject: [PATCH] fixup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/tall-fireants-fix.md              |  6 ++++++
 contrib/docs/tutorials/prometheus-metrics.md |  4 ++--
 packages/backend/package.json                |  2 +-
 plugins/catalog-backend/package.json         |  2 +-
 plugins/scaffolder-backend/package.json      |  2 +-
 yarn.lock                                    | 17 +++++++++--------
 6 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/tall-fireants-fix.md

diff --git a/.changeset/tall-fireants-fix.md b/.changeset/tall-fireants-fix.md
new file mode 100644
index 0000000000..3fbc78290f
--- /dev/null
+++ b/.changeset/tall-fireants-fix.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+'@backstage/plugin-catalog-backend': patch
+---
+
+Upgraded `prom-client` to version 15
diff --git a/contrib/docs/tutorials/prometheus-metrics.md b/contrib/docs/tutorials/prometheus-metrics.md
index 56989e709c..fb4366c7f7 100644
--- a/contrib/docs/tutorials/prometheus-metrics.md
+++ b/contrib/docs/tutorials/prometheus-metrics.md
@@ -11,8 +11,8 @@ This is a small tutorial that goes over how to setup your Backstage instance to
    ```diff
    // packages/backend/package.json
        "dependencies": {
-   +   "express-prom-bundle": "^6.3.6",
-   +   "prom-client": "^14.0.1",
+   +   "express-prom-bundle": "^7.0.0",
+   +   "prom-client": "^15.0.0",
    ```
 
 2. Now we want to run `yarn install` from the root of the project to get those dependencies in place
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 27ef9e1a4c..0f075e8d81 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -96,7 +96,7 @@
     "mysql2": "^2.2.5",
     "pg": "^8.11.3",
     "pg-connection-string": "^2.3.0",
-    "prom-client": "^14.0.1",
+    "prom-client": "^15.0.0",
     "winston": "^3.2.1"
   },
   "devDependencies": {
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 6d371e3897..512794f3b3 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -79,7 +79,7 @@
     "minimatch": "^5.0.0",
     "node-fetch": "^2.6.7",
     "p-limit": "^3.0.2",
-    "prom-client": "^14.0.1",
+    "prom-client": "^15.0.0",
     "uuid": "^8.0.0",
     "winston": "^3.2.1",
     "yaml": "^2.0.0",
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 42a17a382c..9026761a7c 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -84,7 +84,7 @@
     "nunjucks": "^3.2.3",
     "p-limit": "^3.1.0",
     "p-queue": "^6.6.2",
-    "prom-client": "^14.0.1",
+    "prom-client": "^15.0.0",
     "uuid": "^8.2.0",
     "winston": "^3.2.1",
     "yaml": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 614b1b99b2..a57ba807c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5735,7 +5735,7 @@ __metadata:
     msw: ^1.0.0
     node-fetch: ^2.6.7
     p-limit: ^3.0.2
-    prom-client: ^14.0.1
+    prom-client: ^15.0.0
     supertest: ^6.1.3
     uuid: ^8.0.0
     wait-for-expect: ^3.0.2
@@ -8640,7 +8640,7 @@ __metadata:
     nunjucks: ^3.2.3
     p-limit: ^3.1.0
     p-queue: ^6.6.2
-    prom-client: ^14.0.1
+    prom-client: ^15.0.0
     strip-ansi: ^7.1.0
     supertest: ^6.1.3
     uuid: ^8.2.0
@@ -14735,7 +14735,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/api@npm:^1.0.1, @opentelemetry/api@npm:^1.3.0, @opentelemetry/api@npm:^1.4.1":
+"@opentelemetry/api@npm:^1.0.1, @opentelemetry/api@npm:^1.3.0, @opentelemetry/api@npm:^1.4.0, @opentelemetry/api@npm:^1.4.1":
   version: 1.7.0
   resolution: "@opentelemetry/api@npm:1.7.0"
   checksum: 2398cbe65f199c3a7050125b3ad9c835f789bb0a616665e9c7f4475a29ac8334b6a3c15f38db48d345b522180c41c00b04cc174cd0eeffba98eb4874a565fa7e
@@ -27789,7 +27789,7 @@ __metadata:
     mysql2: ^2.2.5
     pg: ^8.11.3
     pg-connection-string: ^2.3.0
-    prom-client: ^14.0.1
+    prom-client: ^15.0.0
     winston: ^3.2.1
   languageName: unknown
   linkType: soft
@@ -39016,12 +39016,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prom-client@npm:^14.0.1":
-  version: 14.2.0
-  resolution: "prom-client@npm:14.2.0"
+"prom-client@npm:^15.0.0":
+  version: 15.1.0
+  resolution: "prom-client@npm:15.1.0"
   dependencies:
+    "@opentelemetry/api": ^1.4.0
     tdigest: ^0.1.1
-  checksum: d4c04e57616c72643dd02862d0d4bde09cf8869a19d0aef5e7b785e6e27d02439b66cdc165e3492f62d579fa91579183820870cc757a09b99399d2d02f46b9f1
+  checksum: 85bb134dfd0aab4606a27bce2d478d82650053da4340390210ed8280c14af24fc703a28fbc401b5edb4b756686a3df229f243ce5c7166c53925236fb763e4a51
   languageName: node
   linkType: hard