django-prometheus 2.4.0.dev15__tar.gz → 2.4.0.dev17__tar.gz

{django_prometheus-2.4.0.dev15/django_prometheus.egg-info → django_prometheus-2.4.0.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-prometheus
-Version: 2.4.0.dev15
+Version: 2.4.0.dev17
 Summary: Django middlewares to monitor your application with Prometheus.io.
 Home-page: http://github.com/korfuri/django-prometheus
 Author: Uriel Corfa
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
 Classifier: Framework :: Django :: 5.1

{django_prometheus-2.4.0.dev15 → django_prometheus-2.4.0.dev17}/django_prometheus/__init__.py

@@ -10,7 +10,7 @@ from django_prometheus import middleware, models
 
 __all__ = ["middleware", "models", "pip_prometheus"]
 
-__version__ = "2.4.0.dev15"
+__version__ = "2.4.0.dev17"
 
 
 # Import pip_prometheus to export the pip metrics automatically.

{django_prometheus-2.4.0.dev15 → django_prometheus-2.4.0.dev17}/django_prometheus/cache/backends/redis.py

@@ -1,4 +1,4 @@
-from django import VERSION as DJANGO_VERSION
+from django.core.cache.backends.redis import RedisCache as DjangoRedisCache
 from django_redis import cache, exceptions
 
 from django_prometheus.cache.metrics import (
@@ -33,20 +33,17 @@ class RedisCache(cache.RedisCache):
                 return default
 
 
-if DJANGO_VERSION >= (4, 0):
-    from django.core.cache.backends.redis import RedisCache as DjangoRedisCache
-
-    class NativeRedisCache(DjangoRedisCache):
-        def get(self, key, default=None, version=None):
-            django_cache_get_total.labels(backend="native_redis").inc()
-            try:
-                result = super().get(key, default=None, version=version)
-            except Exception:
-                django_cache_get_fail_total.labels(backend="native_redis").inc()
-                raise
-            if result is not None:
-                django_cache_hits_total.labels(backend="native_redis").inc()
-                return result
-            else:
-                django_cache_misses_total.labels(backend="native_redis").inc()
-                return default
+class NativeRedisCache(DjangoRedisCache):
+    def get(self, key, default=None, version=None):
+        django_cache_get_total.labels(backend="native_redis").inc()
+        try:
+            result = super().get(key, default=None, version=version)
+        except Exception:
+            django_cache_get_fail_total.labels(backend="native_redis").inc()
+            raise
+        if result is not None:
+            django_cache_hits_total.labels(backend="native_redis").inc()
+            return result
+        else:
+            django_cache_misses_total.labels(backend="native_redis").inc()
+            return default

{django_prometheus-2.4.0.dev15 → django_prometheus-2.4.0.dev17}/django_prometheus/db/backends/postgis/base.py

@@ -1,6 +1,6 @@
 from django.contrib.gis.db.backends.postgis import base
+from django.db.backends.postgresql.base import Cursor
 
-from django_prometheus.db.backends.common import get_postgres_cursor_class
 from django_prometheus.db.common import DatabaseWrapperMixin, ExportingCursorWrapper
 
 
@@ -8,8 +8,11 @@ class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
     def get_new_connection(self, *args, **kwargs):
         conn = super().get_new_connection(*args, **kwargs)
         conn.cursor_factory = ExportingCursorWrapper(
-            conn.cursor_factory or get_postgres_cursor_class(), "postgis", self.vendor
+            conn.cursor_factory or Cursor(),
+            "postgis",
+            self.vendor,
         )
+
         return conn
 
     def create_cursor(self, name=None):

{django_prometheus-2.4.0.dev15 → django_prometheus-2.4.0.dev17}/django_prometheus/db/backends/postgresql/base.py

@@ -1,6 +1,6 @@
 from django.db.backends.postgresql import base
+from django.db.backends.postgresql.base import Cursor
 
-from django_prometheus.db.backends.common import get_postgres_cursor_class
 from django_prometheus.db.common import DatabaseWrapperMixin, ExportingCursorWrapper
 
 
@@ -8,8 +8,11 @@ class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
     def get_new_connection(self, *args, **kwargs):
         conn = super().get_new_connection(*args, **kwargs)
         conn.cursor_factory = ExportingCursorWrapper(
-            conn.cursor_factory or get_postgres_cursor_class(), self.alias, self.vendor
+            conn.cursor_factory or Cursor(),
+            self.alias,
+            self.vendor,
         )
+
         return conn
 
     def create_cursor(self, name=None):

{django_prometheus-2.4.0.dev15 → django_prometheus-2.4.0.dev17}/django_prometheus/middleware.py

@@ -219,10 +219,10 @@ class PrometheusAfterMiddleware(MiddlewareMixin):
         self.label_metric(self.metrics.requests_by_transport, request, transport=transport).inc()
 
         # Mimic the behaviour of the deprecated "Request.is_ajax()" method.
-        if request.META.get("HTTP_X_REQUESTED_WITH") == "XMLHttpRequest":
+        if request.headers.get("x-requested-with") == "XMLHttpRequest":
             self.label_metric(self.metrics.requests_ajax, request).inc()
 
-        content_length = int(request.META.get("CONTENT_LENGTH") or 0)
+        content_length = int(request.headers.get("content-length") or 0)
         self.label_metric(self.metrics.requests_body_bytes, request).observe(content_length)
         request.prometheus_after_middleware_event = Time()
 

{django_prometheus-2.4.0.dev15 → django_prometheus-2.4.0.dev17/django_prometheus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-prometheus
-Version: 2.4.0.dev15
+Version: 2.4.0.dev17
 Summary: Django middlewares to monitor your application with Prometheus.io.
 Home-page: http://github.com/korfuri/django-prometheus
 Author: Uriel Corfa
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
 Classifier: Framework :: Django :: 5.1

{django_prometheus-2.4.0.dev15 → django_prometheus-2.4.0.dev17}/django_prometheus.egg-info/SOURCES.txt

@@ -31,7 +31,6 @@ django_prometheus/db/__init__.py
 django_prometheus/db/common.py
 django_prometheus/db/metrics.py
 django_prometheus/db/backends/__init__.py
-django_prometheus/db/backends/common.py
 django_prometheus/db/backends/mysql/__init__.py
 django_prometheus/db/backends/mysql/base.py
 django_prometheus/db/backends/postgis/__init__.py

{django_prometheus-2.4.0.dev15 → django_prometheus-2.4.0.dev17}/setup.py

@@ -55,6 +55,7 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Framework :: Django :: 4.2",
         "Framework :: Django :: 5.0",
         "Framework :: Django :: 5.1",

django_prometheus-2.4.0.dev15/django_prometheus/db/backends/common.py

@@ -1,9 +0,0 @@
-from django import VERSION
-
-
-def get_postgres_cursor_class():
-    if VERSION < (4, 2):
-        from psycopg2.extensions import cursor as cursor_cls
-    else:
-        from django.db.backends.postgresql.base import Cursor as cursor_cls
-    return cursor_cls