From 3858b29d8051261e2ee4d46387031091af1777c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= <ivarconr@gmail.com>
Date: Mon, 7 Jun 2021 10:34:32 +0200
Subject: [PATCH] fix: register metrics middleware before pre-hook (#866)

---
 src/lib/app.ts     | 10 ++++++----
 src/lib/metrics.ts |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/lib/app.ts b/src/lib/app.ts
index 97740fd01c..cecf25c4c4 100644
--- a/src/lib/app.ts
+++ b/src/lib/app.ts
@@ -46,6 +46,12 @@ export default function getApp(
     app.set('port', config.server.port);
     app.locals.baseUriPath = baseUriPath;
 
+    if (config.server.serverMetrics && eventBus) {
+        app.use(responseTimeMetrics(eventBus));
+    }
+
+    app.use(requestLogger(config));
+
     if (typeof config.preHook === 'function') {
         config.preHook(app, config, services);
     }
@@ -58,10 +64,6 @@ export default function getApp(
     app.use(cookieParser());
     app.use(express.json({ strict: false }));
     app.use(unleashDbSession(config, stores));
-    if (config.server.serverMetrics && eventBus) {
-        app.use(responseTimeMetrics(eventBus));
-    }
-    app.use(requestLogger(config));
     app.use(secureHeaders(config));
     app.use(express.urlencoded({ extended: true }));
     app.use(favicon(path.join(publicFolder, 'favicon.ico')));
diff --git a/src/lib/metrics.ts b/src/lib/metrics.ts
index e8876dfa5a..d13cbaeda5 100644
--- a/src/lib/metrics.ts
+++ b/src/lib/metrics.ts
@@ -44,13 +44,13 @@ export default class MetricsMonitor {
             name: 'http_request_duration_milliseconds',
             help: 'App response time',
             labelNames: ['path', 'method', 'status'],
-            percentiles: [0.1, 0.5, 0.9, 0.99],
+            percentiles: [0.1, 0.5, 0.9, 0.95, 0.99],
         });
         const dbDuration = new client.Summary({
             name: 'db_query_duration_seconds',
             help: 'DB query duration time',
             labelNames: ['store', 'action'],
-            percentiles: [0.1, 0.5, 0.9, 0.99],
+            percentiles: [0.1, 0.5, 0.9, 0.95, 0.99],
         });
         const featureToggleUpdateTotal = new client.Counter({
             name: 'feature_toggle_update_total',