Merge branch 'development'

cabal.project

@@ -87,3 +87,8 @@ source-repository-package
   type: git
   location: https://github.com/goodlyrottenapple/tasty-test-reporter
   tag: b704130
+
+source-repository-package
+  type: git
+  location: https://github.com/worm2fed/servant-prometheus
+  tag: 9f967b3b42b183653b91f0ba9097621797ad107d

changelog.d/810

@@ -0,0 +1,2 @@
+synopsis: Record more route duration metrics with prometheus
+prs: #810

flora.cabal

@@ -426,6 +426,7 @@ library flora-web
     , servant-client
     , servant-client-core
     , servant-openapi3
+    , servant-prometheus
     , servant-server
     , text
     , text-display

src/web/FloraWeb/Server.hs

@@ -33,14 +33,15 @@ import Network.Wai.Handler.Warp
   )
 import Network.Wai.Log qualified as WaiLog
 import Network.Wai.Middleware.Heartbeat (heartbeatMiddleware)
-import Network.Wai.Middleware.Prometheus qualified as P
+import Network.Wai.Middleware.Prometheus qualified as WaiMetrics
 import OddJobs.Endpoints qualified as OddJobs
 import OddJobs.Job (startJobRunner)
 import OddJobs.Types qualified as OddJobs
 import Optics.Core
 import Prometheus qualified as P
 import Prometheus.Metric.GHC qualified as P
 import Prometheus.Metric.Proc qualified as P
+import Prometheus.Servant qualified as P
 import Sel
 import Servant
   ( Application
@@ -177,9 +178,8 @@ runServer appLogger floraEnv = do
     $ heartbeatMiddleware
       . loggingMiddleware
       . const
-    $ P.prometheus
-      P.def
-      server
+    $ WaiMetrics.prometheus WaiMetrics.def
+    $ P.prometheusMiddleware P.defaultMetrics (Proxy @ServerRoutes) server
 
 mkServer
   :: Logger