diff --git a/.ci/stack-lts-16.yaml b/.ci/stack-lts-16.yaml index e2da4ba..83f9860 100644 --- a/.ci/stack-lts-16.yaml +++ b/.ci/stack-lts-16.yaml @@ -6,7 +6,7 @@ packages: - ../prometheus-proc - ../wai-middleware-prometheus extra-deps: -- data-sketches-0.3.1.0 -- data-sketches-core-0.1.0.0 +- data-sketches-0.4.0.0 +- data-sketches-core-0.2.0.1 - unix-memory-0.1.2 resolver: lts-16.6 diff --git a/.ci/stack-lts-21.yaml b/.ci/stack-lts-21.yaml index 6354a35..0ea1aa7 100644 --- a/.ci/stack-lts-21.yaml +++ b/.ci/stack-lts-21.yaml @@ -6,5 +6,7 @@ packages: - ../prometheus-proc - ../wai-middleware-prometheus extra-deps: +- data-sketches-0.4.0.0 +- data-sketches-core-0.2.0.1 - unix-memory-0.1.2 resolver: lts-21.25 diff --git a/.ci/stack-lts-22.yaml b/.ci/stack-lts-22.yaml index 18f3029..1a1c807 100644 --- a/.ci/stack-lts-22.yaml +++ b/.ci/stack-lts-22.yaml @@ -7,4 +7,6 @@ packages: - ../wai-middleware-prometheus extra-deps: - unix-memory-0.1.2 +- data-sketches-0.4.0.0 +- data-sketches-core-0.2.0.1 resolver: lts-22.12 \ No newline at end of file diff --git a/.ci/stack-nightly.yaml b/.ci/stack-nightly.yaml index 90c60f9..9b0bfd2 100644 --- a/.ci/stack-nightly.yaml +++ b/.ci/stack-nightly.yaml @@ -7,4 +7,6 @@ packages: - ../wai-middleware-prometheus extra-deps: - unix-memory-0.1.2 -resolver: nightly-2024-03-01 \ No newline at end of file +- data-sketches-0.4.0.0 +- data-sketches-core-0.2.0.1 +resolver: nightly-2026-04-01 \ No newline at end of file diff --git a/prometheus-client/prometheus-client.cabal b/prometheus-client/prometheus-client.cabal index 3f23321..b3a7819 100644 --- a/prometheus-client/prometheus-client.cabal +++ b/prometheus-client/prometheus-client.cabal @@ -49,7 +49,7 @@ library , utf8-string , exceptions , text - , data-sketches < 0.4 + , data-sketches >= 0.4 && <0.5 ghc-options: -Wall test-suite doctest @@ -86,7 +86,7 @@ test-suite spec , exceptions , text , primitive - , data-sketches < 0.4 + , data-sketches >= 0.4 && <0.5 ghc-options: -Wall benchmark bench diff --git a/prometheus-client/src/Prometheus/Metric/Summary.hs b/prometheus-client/src/Prometheus/Metric/Summary.hs index dcc5b5d..15218c2 100644 --- a/prometheus-client/src/Prometheus/Metric/Summary.hs +++ b/prometheus-client/src/Prometheus/Metric/Summary.hs @@ -69,7 +69,8 @@ determineK (rank_, acceptableError) = go 6 summary :: Info -> [Quantile] -> Metric Summary summary info quantiles_ = Metric $ do rs <- mkReqSketch kInt HighRanksAreAccurate - mv <- newMVar $ rs {criterion = (:<=)} + setCriterionLE rs + mv <- newMVar rs let summary_ = MkSummary mv quantiles_ return (summary_, collectSummary info summary_) where diff --git a/stack.yaml b/stack.yaml index ec9efad..cf559b8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,5 +7,6 @@ packages: - wai-middleware-prometheus extra-deps: - unix-memory-0.1.2 -- data-sketches-0.3.0.0 -resolver: lts-18.5 +- data-sketches-0.4.0.0 +- data-sketches-core-0.2.0.1 +resolver: lts-24.40