Merge branch 'korfuri:master' into master

Author: egguy

django_prometheus/__init__.py

@@ -6,6 +6,7 @@
 # Import all files that define metrics. This has the effect that
 # `import django_prometheus` will always instantiate all metric
 # objects right away.
+import django
 from django_prometheus import middleware, models
 
 __all__ = ["middleware", "models", "pip_prometheus"]
@@ -19,4 +20,5 @@
     # If people don't have pip, don't export anything.
     pass
 
-default_app_config = "django_prometheus.apps.DjangoPrometheusConfig"
+if django.VERSION < (3, 2):
+    default_app_config = "django_prometheus.apps.DjangoPrometheusConfig"

documentation/exports.md

@@ -76,6 +76,13 @@ This will make Django-Prometheus try to export /metrics on port
 You can then configure Prometheus to collect metrics on as many
 targets as you have workers, using each port separately.
 
+This approach requires the application to be loaded into each child process.
+uWSGI and Gunicorn typically load the application into the master process before forking the child processes.
+Set the [lazy-apps option](https://uwsgi-docs.readthedocs.io/en/latest/Options.html#lazy-apps) to `true` (uWSGI) 
+or the [preload-app option](https://docs.gunicorn.org/en/stable/settings.html#preload-app) to `false` (Gunicorn)
+to change this behaviour.  
+
+
 ## Exporting /metrics in a WSGI application with multiple processes globally
 
 In some WSGI applications, workers are short lived (less than a minute), so some

requirements.txt

@@ -2,10 +2,10 @@ django-redis>=4.12.1
 black; python_version >= '3.6'
 flake8
 isort>=5.5.4,<6
-prometheus-client>=0.7
+prometheus-client>=0.9.0
 pip-prometheus>=1.2.1
 mysqlclient
 psycopg2
-pytest>=6.1.1,<7
+pytest==6.2.3
 pytest-django
 python-memcached

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py36,py37,py38}-django{220,300,310}-{end2end,unittests},py38-lint
+envlist = {py36,py37,py38}-django{220,300,310,320}-{end2end,unittests},py38-lint
 
 [testenv]
 deps =