From 63b6d89caa6ad89e9594bc7e38275c4083fd698f Mon Sep 17 00:00:00 2001
From: Steve <s.schwalowski@finway.de>
Date: Fri, 5 Jan 2024 23:58:13 +0100
Subject: [PATCH] Update prom-client to v15

---
 package-lock.json | 26 ++++++++++++++++++--------
 package.json      |  4 ++--
 types/index.d.ts  |  4 ++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b4a60eb..6f58089 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "express-prom-bundle",
-  "version": "6.6.0",
+  "version": "7.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "express-prom-bundle",
-      "version": "6.6.0",
+      "version": "7.0.0",
       "license": "MIT",
       "dependencies": {
         "@types/express": "^4.17.21",
@@ -21,7 +21,7 @@
         "jasme": "^6.0.0",
         "koa": "^2.6.2",
         "koa-connect": "^2.0.1",
-        "prom-client": "^13.0.0",
+        "prom-client": "^15.0.0",
         "supertest": "^3.3.0",
         "supertest-koa-agent": "^0.3.0",
         "tsd": "^0.30.3",
@@ -31,7 +31,7 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "prom-client": ">=12.0.0"
+        "prom-client": ">=15.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -101,6 +101,15 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz",
+      "integrity": "sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -3264,15 +3273,16 @@
       }
     },
     "node_modules/prom-client": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-13.0.0.tgz",
-      "integrity": "sha512-M7ZNjIO6x+2R/vjSD13yjJPjpoZA8eEwH2Bp2Re0/PvzozD7azikv+SaBtZes4Q1ca/xHjZ4RSCuTag3YZLg1A==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-15.1.0.tgz",
+      "integrity": "sha512-cCD7jLTqyPdjEPBo/Xk4Iu8jxjuZgZJ3e/oET3L+ZwOuap/7Cw3dH/TJSsZKs1TQLZ2IHpIlRAKw82ef06kmMw==",
       "dev": true,
       "dependencies": {
+        "@opentelemetry/api": "^1.4.0",
         "tdigest": "^0.1.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^16 || ^18 || >=20"
       }
     },
     "node_modules/proxy-addr": {
diff --git a/package.json b/package.json
index 52ab534..f93e972 100644
--- a/package.json
+++ b/package.json
@@ -36,14 +36,14 @@
     "jasme": "^6.0.0",
     "koa": "^2.6.2",
     "koa-connect": "^2.0.1",
-    "prom-client": "^13.0.0",
+    "prom-client": "^15.0.0",
     "supertest": "^3.3.0",
     "supertest-koa-agent": "^0.3.0",
     "tsd": "^0.30.3",
     "typescript": "^3.4.5"
   },
   "peerDependencies": {
-    "prom-client": ">=12.0.0"
+    "prom-client": ">=15.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/types/index.d.ts b/types/index.d.ts
index a024a89..1ab68bc 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -1,7 +1,7 @@
 // TypeScript Version: 2.8
 
 import { Request, RequestHandler, Response, Express } from 'express';
-import { DefaultMetricsCollectorConfiguration, Registry } from 'prom-client';
+import { DefaultMetricsCollectorConfiguration, Registry, RegistryContentType } from 'prom-client';
 
 export {};
 
@@ -48,7 +48,7 @@ declare namespace express_prom_bundle {
 
     metricsPath?: string;
     httpDurationMetricName?: string;
-    promClient?: { collectDefaultMetrics?: DefaultMetricsCollectorConfiguration };
+    promClient?: { collectDefaultMetrics?: DefaultMetricsCollectorConfiguration<RegistryContentType> };
     promRegistry?: Registry;
     normalizePath?: NormalizePathEntry[] | NormalizePathFn;
     formatStatusCode?: NormalizeStatusCodeFn;