diff --git a/PaymentServer.cabal b/PaymentServer.cabal index 32a86dbf00eca5d150f454aa9f02c6f8b97b77f0..b4c0c30ad9771d6c20de92a1935ac8bef4d61688 100644 --- a/PaymentServer.cabal +++ b/PaymentServer.cabal @@ -1,5 +1,5 @@ name: PaymentServer -version: 0.1.0.0 +version: 0.1.1.0 synopsis: Coordinate entities for the purchase of PrivateStorage.io vouchers. -- description: homepage: https://github.com/privatestorageio/PaymentServer#readme diff --git a/nix/PaymentServer.nix b/nix/PaymentServer.nix index d4e81b551156a4757acea10d7f0b4cea41900f63..993b320003c165a63a9d771361260025bb65f6cc 100644 --- a/nix/PaymentServer.nix +++ b/nix/PaymentServer.nix @@ -42,7 +42,7 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: flags = {}; package = { specVersion = "1.10"; - identifier = { name = "PaymentServer"; version = "0.1.0.0"; }; + identifier = { name = "PaymentServer"; version = "0.1.1.0"; }; license = "Apache-2.0"; copyright = "2019 Private Storage.io, LLC."; maintainer = "support@privatestorage.io"; diff --git a/nix/servant-prometheus.nix b/nix/servant-prometheus.nix index fb013289ac659a8bad420e5ef170d2a26517febe..07ee24d0e5d971fb99aed1cfab63ef5db1194cd1 100644 --- a/nix/servant-prometheus.nix +++ b/nix/servant-prometheus.nix @@ -42,7 +42,7 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: flags = {}; package = { specVersion = "1.10"; - identifier = { name = "servant-prometheus"; version = "0.1.0.0"; }; + identifier = { name = "servant-prometheus"; version = "0.2.0.0"; }; license = "BSD-3-Clause"; copyright = ""; maintainer = "Alex Mason <axman6@gmail.com>, Jack Kelly <jack.kelly@data61.csiro.au>"; @@ -106,7 +106,7 @@ in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }: } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/PrivateStorageio/servant-prometheus.git"; - rev = "ec21c5ed50e6f6f8e52916ce71cd68fcd0166cad"; - sha256 = "0lswszfs52x5rpf7lj46iv77zghcbr4d05dwssi63yzjll1ixizd"; + rev = "b9461cbf689b47506b2eee973136706092b74968"; + sha256 = "1gfslw670ri119bnq3szc8b08n504f8cnzs5cgk5qvfwvfmsr1xh"; }); } \ No newline at end of file diff --git a/src/PaymentServer/Server.hs b/src/PaymentServer/Server.hs index 8842dab1ee84f211897886dfbc181dcd12c09a4e..2df1d1087e0c84bda60ddf9cf751abe0d603cf8c 100644 --- a/src/PaymentServer/Server.hs +++ b/src/PaymentServer/Server.hs @@ -23,10 +23,12 @@ import Servant , (:>) , (:<|>)((:<|>)) ) +import Prometheus + ( register + ) import Servant.Prometheus - ( MeasureQuantiles(WithQuantiles) - , monitorServant - , makeMeters + ( monitorServant + , meters ) import Web.Stripe.Client @@ -94,5 +96,5 @@ paymentServerApp corsOrigins stripeConfig issuer = -- | Create middleware which captures metrics for the payment server app. makeMetricsMiddleware :: IO (Application -> Application) makeMetricsMiddleware = do - meters <- makeMeters paymentServerAPI WithQuantiles - return $ monitorServant paymentServerAPI meters + meters <- register $ meters paymentServerAPI + return $ monitorServant meters diff --git a/stack.yaml b/stack.yaml index 3a4243691337cedb0356d9a76154c8aef27c46bd..2798c9a51a38637650bbe93fb6e947c57b4f458b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -42,7 +42,7 @@ extra-deps: - "stripe-haskell-2.5.0" - "stripe-http-client-2.5.0" - github: "PrivateStorageio/servant-prometheus" - commit: "ec21c5ed50e6f6f8e52916ce71cd68fcd0166cad" + commit: "b9461cbf689b47506b2eee973136706092b74968" # Override default flag values for local packages and extra-deps # flags: {}