From 5d2b18e501bbda771fe8930e8af55fd367741056 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 8 Apr 2021 11:09:39 +0100 Subject: [PATCH 1/2] bump pip-tools when freezing dependencies to stop big diffs from change in formatting of reqs.txt --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8214c478c..8f6532575 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ fix-imports: .PHONY: freeze-requirements freeze-requirements: ## create static requirements.txt - ${VIRTUALENV_ROOT}/bin/pip install pip-tools + ${VIRTUALENV_ROOT}/bin/pip install --upgrade pip-tools ${VIRTUALENV_ROOT}/bin/pip-compile requirements.in .PHONY: clean From 8954dc2faef0b5b1a14f117cb57c9ca4395a1c75 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 8 Apr 2021 11:09:45 +0100 Subject: [PATCH 2/2] skip prometheus-client 0.10.0 we saw exceptions on prod that I think might have caused a worker that is being terminated to die ungracefully. While I'm not sure if this is an actual problem that changed behaviour (app instances crashing and restarting), at the very least it definitely polluted the logs and obscured any actual issues we were having. https://github.com/prometheus/client_python/releases/tag/v0.10.0 see the pending fix for this problem here: https://github.com/prometheus/client_python/pull/644 --- requirements.in | 3 ++- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 6f14a4595..37d41edc9 100644 --- a/requirements.in +++ b/requirements.in @@ -28,5 +28,6 @@ git+https://github.com/alphagov/notifications-utils.git@44.1.0#egg=notifications git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha#egg=govuk-frontend-jinja==0.5.8-alpha # gds-metrics requires prometheseus 0.2.0, override that requirement as later versions bring significant performance gains -prometheus-client==0.10.0 +# version 0.10.0 introduced exceptions when workers crashed due to deprecating lower case `prometheus_multiproc_dir`. +prometheus-client>=0.9.0,!=0.10.0 gds-metrics==0.2.4 diff --git a/requirements.txt b/requirements.txt index debcea521..137ae320c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -118,7 +118,7 @@ packaging==20.9 # via bleach phonenumbers==8.12.20 # via notifications-utils -prometheus-client==0.10.0 +prometheus-client==0.9.0 # via # -r requirements.in # gds-metrics