From d731bffc7f37d43334ee96968f0124e6b66419ab Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 4 Apr 2026 11:41:51 +0200 Subject: [PATCH 1/4] Fix build with data-sketches 0.4 --- prometheus-client/prometheus-client.cabal | 2 +- prometheus-client/src/Prometheus/Metric/Summary.hs | 3 ++- stack.yaml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/prometheus-client/prometheus-client.cabal b/prometheus-client/prometheus-client.cabal index 3f23321..eed7c8c 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 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..b19dae4 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,5 +7,5 @@ packages: - wai-middleware-prometheus extra-deps: - unix-memory-0.1.2 -- data-sketches-0.3.0.0 +- data-sketches-0.4.0.0 resolver: lts-18.5 From 3fb40eebadff13ec96a42ae248bf104a4772212a Mon Sep 17 00:00:00 2001 From: Will Coster Date: Wed, 20 May 2026 10:30:59 -0700 Subject: [PATCH 2/4] Make tests pass with data-sketches 0.4 --- prometheus-client/prometheus-client.cabal | 2 +- stack.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/prometheus-client/prometheus-client.cabal b/prometheus-client/prometheus-client.cabal index eed7c8c..b3a7819 100644 --- a/prometheus-client/prometheus-client.cabal +++ b/prometheus-client/prometheus-client.cabal @@ -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/stack.yaml b/stack.yaml index b19dae4..cf559b8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -8,4 +8,5 @@ packages: extra-deps: - unix-memory-0.1.2 - data-sketches-0.4.0.0 -resolver: lts-18.5 +- data-sketches-core-0.2.0.1 +resolver: lts-24.40 From ea77ff4c68d101378fb9a59ea6f9637360576c4f Mon Sep 17 00:00:00 2001 From: Will Coster Date: Wed, 20 May 2026 10:37:47 -0700 Subject: [PATCH 3/4] Update CI stack.yaml --- .ci/stack-lts-16.yaml | 4 ++-- .ci/stack-lts-21.yaml | 2 ++ .ci/stack-lts-22.yaml | 3 ++- .ci/stack-nightly.yaml | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) 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..8449476 100644 --- a/.ci/stack-lts-22.yaml +++ b/.ci/stack-lts-22.yaml @@ -6,5 +6,6 @@ packages: - ../prometheus-proc - ../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 From 23e80e6ef835509a2e32d7ea13048a49a847ba0e Mon Sep 17 00:00:00 2001 From: Will Coster Date: Wed, 20 May 2026 11:23:44 -0700 Subject: [PATCH 4/4] Update stack-lts-22.yaml --- .ci/stack-lts-22.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/stack-lts-22.yaml b/.ci/stack-lts-22.yaml index 8449476..1a1c807 100644 --- a/.ci/stack-lts-22.yaml +++ b/.ci/stack-lts-22.yaml @@ -6,6 +6,7 @@ packages: - ../prometheus-proc - ../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