Skip to content

Commit 68a737d

Browse files
asherfasherf
authored
Add ruff (#369)
1 parent 58c0c5a commit 68a737d

File tree

18 files changed

+78
-223
lines changed

18 files changed

+78
-223
lines changed

‎django_prometheus/conf/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,4 @@
2424

2525
if settings.configured:
2626
NAMESPACE = getattr(settings, "PROMETHEUS_METRIC_NAMESPACE", NAMESPACE)
27-
PROMETHEUS_LATENCY_BUCKETS = getattr(
28-
settings, "PROMETHEUS_LATENCY_BUCKETS", PROMETHEUS_LATENCY_BUCKETS
29-
)
27+
PROMETHEUS_LATENCY_BUCKETS = getattr(settings, "PROMETHEUS_LATENCY_BUCKETS", PROMETHEUS_LATENCY_BUCKETS)

‎django_prometheus/db/backends/mysql/base.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
1414

1515
def create_cursor(self, name=None):
1616
cursor = self.connection.cursor()
17-
CursorWrapper = ExportingCursorWrapper(
18-
self.CURSOR_CLASS, self.alias, self.vendor
19-
)
17+
CursorWrapper = ExportingCursorWrapper(self.CURSOR_CLASS, self.alias, self.vendor)
2018
return CursorWrapper(cursor)

‎django_prometheus/db/backends/postgis/base.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
88
def get_connection_params(self):
99
conn_params = super().get_connection_params()
10-
conn_params["cursor_factory"] = ExportingCursorWrapper(
11-
psycopg2.extensions.cursor, "postgis", self.vendor
12-
)
10+
conn_params["cursor_factory"] = ExportingCursorWrapper(psycopg2.extensions.cursor, "postgis", self.vendor)
1311
return conn_params
1412

1513
def create_cursor(self, name=None):

‎django_prometheus/db/backends/postgresql/base.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ class DatabaseFeatures(base.DatabaseFeatures):
1313
class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
1414
def get_connection_params(self):
1515
conn_params = super().get_connection_params()
16-
conn_params["cursor_factory"] = ExportingCursorWrapper(
17-
psycopg2.extensions.cursor, self.alias, self.vendor
18-
)
16+
conn_params["cursor_factory"] = ExportingCursorWrapper(psycopg2.extensions.cursor, self.alias, self.vendor)
1917
return conn_params
2018

2119
def create_cursor(self, name=None):

‎django_prometheus/db/common.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ def get_new_connection(self, *args, **kwargs):
4848
raise
4949

5050
def create_cursor(self, name=None):
51-
return self.connection.cursor(
52-
factory=ExportingCursorWrapper(self.CURSOR_CLASS, self.alias, self.vendor)
53-
)
51+
return self.connection.cursor(factory=ExportingCursorWrapper(self.CURSOR_CLASS, self.alias, self.vendor))
5452

5553

5654
def ExportingCursorWrapper(cursor_class, alias, vendor):

‎django_prometheus/db/metrics.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818

1919
execute_total = Counter(
2020
"django_db_execute_total",
21-
(
22-
"Counter of executed statements by database and by vendor, including"
23-
" bulk executions."
24-
),
21+
("Counter of executed statements by database and by vendor, including" " bulk executions."),
2522
["alias", "vendor"],
2623
namespace=NAMESPACE,
2724
)

‎django_prometheus/exports.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ def SetupPrometheusEndpointOnPortRange(port_range, addr=""):
9393
thread.start()
9494
logger.info("Exporting Prometheus /metrics/ on port %s" % port)
9595
return port # Stop trying ports at this point
96-
logger.warning(
97-
"Cannot export Prometheus /metrics/ - " "no available ports in supplied range"
98-
)
96+
logger.warning("Cannot export Prometheus /metrics/ - " "no available ports in supplied range")
9997
return None
10098

10199

@@ -115,15 +113,10 @@ def ExportToDjangoView(request):
115113
116114
You can use django_prometheus.urls to map /metrics to this view.
117115
"""
118-
if (
119-
"PROMETHEUS_MULTIPROC_DIR" in os.environ
120-
or "prometheus_multiproc_dir" in os.environ
121-
):
116+
if "PROMETHEUS_MULTIPROC_DIR" in os.environ or "prometheus_multiproc_dir" in os.environ:
122117
registry = prometheus_client.CollectorRegistry()
123118
multiprocess.MultiProcessCollector(registry)
124119
else:
125120
registry = prometheus_client.REGISTRY
126121
metrics_page = prometheus_client.generate_latest(registry)
127-
return HttpResponse(
128-
metrics_page, content_type=prometheus_client.CONTENT_TYPE_LATEST
129-
)
122+
return HttpResponse(metrics_page, content_type=prometheus_client.CONTENT_TYPE_LATEST)

‎django_prometheus/middleware.py

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ def register(self):
3636
self.requests_latency_before = self.register_metric(
3737
Histogram,
3838
"django_http_requests_latency_including_middlewares_seconds",
39-
(
40-
"Histogram of requests processing time (including middleware "
41-
"processing time)."
42-
),
39+
("Histogram of requests processing time (including middleware " "processing time)."),
4340
buckets=PROMETHEUS_LATENCY_BUCKETS,
4441
namespace=NAMESPACE,
4542
)
@@ -178,9 +175,7 @@ def process_request(self, request):
178175
def process_response(self, request, response):
179176
self.metrics.responses_total.inc()
180177
if hasattr(request, "prometheus_before_middleware_event"):
181-
self.metrics.requests_latency_before.observe(
182-
TimeSince(request.prometheus_before_middleware_event)
183-
)
178+
self.metrics.requests_latency_before.observe(TimeSince(request.prometheus_before_middleware_event))
184179
else:
185180
self.metrics.requests_unknown_latency_before.inc()
186181
return response
@@ -221,18 +216,14 @@ def process_request(self, request):
221216
transport = self._transport(request)
222217
method = self._method(request)
223218
self.label_metric(self.metrics.requests_by_method, request, method=method).inc()
224-
self.label_metric(
225-
self.metrics.requests_by_transport, request, transport=transport
226-
).inc()
219+
self.label_metric(self.metrics.requests_by_transport, request, transport=transport).inc()
227220

228221
# Mimic the behaviour of the deprecated "Request.is_ajax()" method.
229222
if request.META.get("HTTP_X_REQUESTED_WITH") == "XMLHttpRequest":
230223
self.label_metric(self.metrics.requests_ajax, request).inc()
231224

232225
content_length = int(request.META.get("CONTENT_LENGTH") or 0)
233-
self.label_metric(self.metrics.requests_body_bytes, request).observe(
234-
content_length
235-
)
226+
self.label_metric(self.metrics.requests_body_bytes, request).observe(content_length)
236227
request.prometheus_after_middleware_event = Time()
237228

238229
def _get_view_name(self, request):
@@ -270,9 +261,7 @@ def process_response(self, request, response):
270261
method = self._method(request)
271262
name = self._get_view_name(request)
272263
status = str(response.status_code)
273-
self.label_metric(
274-
self.metrics.responses_by_status, request, response, status=status
275-
).inc()
264+
self.label_metric(self.metrics.responses_by_status, request, response, status=status).inc()
276265
self.label_metric(
277266
self.metrics.responses_by_status_view_method,
278267
request,
@@ -291,9 +280,7 @@ def process_response(self, request, response):
291280
if hasattr(response, "streaming") and response.streaming:
292281
self.label_metric(self.metrics.responses_streaming, request, response).inc()
293282
if hasattr(response, "content"):
294-
self.label_metric(
295-
self.metrics.responses_body_bytes, request, response
296-
).observe(len(response.content))
283+
self.label_metric(self.metrics.responses_body_bytes, request, response).observe(len(response.content))
297284
if hasattr(request, "prometheus_after_middleware_event"):
298285
self.label_metric(
299286
self.metrics.requests_latency_by_view_method,
@@ -303,15 +290,11 @@ def process_response(self, request, response):
303290
method=request.method,
304291
).observe(TimeSince(request.prometheus_after_middleware_event))
305292
else:
306-
self.label_metric(
307-
self.metrics.requests_unknown_latency, request, response
308-
).inc()
293+
self.label_metric(self.metrics.requests_unknown_latency, request, response).inc()
309294
return response
310295

311296
def process_exception(self, request, exception):
312-
self.label_metric(
313-
self.metrics.exceptions_by_type, request, type=type(exception).__name__
314-
).inc()
297+
self.label_metric(self.metrics.exceptions_by_type, request, type=type(exception).__name__).inc()
315298
if hasattr(request, "resolver_match"):
316299
name = request.resolver_match.view_name or "<unnamed view>"
317300
self.label_metric(self.metrics.exceptions_by_view, request, view=name).inc()

‎django_prometheus/migrations.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ def ExportMigrations():
3939
# ready.
4040
from django.db.migrations.executor import MigrationExecutor
4141

42-
if "default" in connections and (
43-
isinstance(connections["default"], DatabaseWrapper)
44-
):
42+
if "default" in connections and (isinstance(connections["default"], DatabaseWrapper)):
4543
# This is the case where DATABASES = {} in the configuration,
4644
# i.e. the user is not using any databases. Django "helpfully"
4745
# adds a dummy database and then throws when you try to

‎django_prometheus/tests/end2end/testapp/test_caches.py

Lines changed: 17 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,9 @@ def testCounters(self):
2222
tested_cache = caches[supported_cache]
2323
backend = supported_cache.split(".")[0]
2424

25-
total_before = (
26-
self.getMetric("django_cache_get_total", backend=backend) or 0
27-
)
28-
hit_before = (
29-
self.getMetric("django_cache_get_hits_total", backend=backend) or 0
30-
)
31-
miss_before = (
32-
self.getMetric("django_cache_get_misses_total", backend=backend) or 0
33-
)
25+
total_before = self.getMetric("django_cache_get_total", backend=backend) or 0
26+
hit_before = self.getMetric("django_cache_get_hits_total", backend=backend) or 0
27+
miss_before = self.getMetric("django_cache_get_misses_total", backend=backend) or 0
3428

3529
tested_cache.set("foo1", "bar")
3630
tested_cache.get("foo1")
@@ -41,12 +35,8 @@ def testCounters(self):
4135

4236
assert result == "default"
4337

44-
self.assertMetricEquals(
45-
total_before + 4, "django_cache_get_total", backend=backend
46-
)
47-
self.assertMetricEquals(
48-
hit_before + 2, "django_cache_get_hits_total", backend=backend
49-
)
38+
self.assertMetricEquals(total_before + 4, "django_cache_get_total", backend=backend)
39+
self.assertMetricEquals(hit_before + 2, "django_cache_get_hits_total", backend=backend)
5040
self.assertMetricEquals(
5141
miss_before + 2,
5242
"django_cache_get_misses_total",
@@ -57,52 +47,27 @@ def test_redis_cache_fail(self):
5747
# Note: test use fake service config (like if server was stopped)
5848
supported_cache = "redis"
5949

60-
total_before = (
61-
self.getMetric("django_cache_get_total", backend=supported_cache) or 0
62-
)
63-
fail_before = (
64-
self.getMetric("django_cache_get_fail_total", backend=supported_cache) or 0
65-
)
66-
hit_before = (
67-
self.getMetric("django_cache_get_hits_total", backend=supported_cache) or 0
68-
)
69-
miss_before = (
70-
self.getMetric("django_cache_get_misses_total", backend=supported_cache)
71-
or 0
72-
)
50+
total_before = self.getMetric("django_cache_get_total", backend=supported_cache) or 0
51+
fail_before = self.getMetric("django_cache_get_fail_total", backend=supported_cache) or 0
52+
hit_before = self.getMetric("django_cache_get_hits_total", backend=supported_cache) or 0
53+
miss_before = self.getMetric("django_cache_get_misses_total", backend=supported_cache) or 0
7354

7455
tested_cache = caches["stopped_redis_ignore_exception"]
7556
tested_cache.get("foo1")
7657

77-
self.assertMetricEquals(
78-
hit_before, "django_cache_get_hits_total", backend=supported_cache
79-
)
80-
self.assertMetricEquals(
81-
miss_before, "django_cache_get_misses_total", backend=supported_cache
82-
)
83-
self.assertMetricEquals(
84-
total_before + 1, "django_cache_get_total", backend=supported_cache
85-
)
86-
self.assertMetricEquals(
87-
fail_before + 1, "django_cache_get_fail_total", backend=supported_cache
88-
)
58+
self.assertMetricEquals(hit_before, "django_cache_get_hits_total", backend=supported_cache)
59+
self.assertMetricEquals(miss_before, "django_cache_get_misses_total", backend=supported_cache)
60+
self.assertMetricEquals(total_before + 1, "django_cache_get_total", backend=supported_cache)
61+
self.assertMetricEquals(fail_before + 1, "django_cache_get_fail_total", backend=supported_cache)
8962

9063
tested_cache = caches["stopped_redis"]
9164
with self.assertRaises(RedisError):
9265
tested_cache.get("foo1")
9366

94-
self.assertMetricEquals(
95-
hit_before, "django_cache_get_hits_total", backend=supported_cache
96-
)
97-
self.assertMetricEquals(
98-
miss_before, "django_cache_get_misses_total", backend=supported_cache
99-
)
100-
self.assertMetricEquals(
101-
total_before + 2, "django_cache_get_total", backend=supported_cache
102-
)
103-
self.assertMetricEquals(
104-
fail_before + 2, "django_cache_get_fail_total", backend=supported_cache
105-
)
67+
self.assertMetricEquals(hit_before, "django_cache_get_hits_total", backend=supported_cache)
68+
self.assertMetricEquals(miss_before, "django_cache_get_misses_total", backend=supported_cache)
69+
self.assertMetricEquals(total_before + 2, "django_cache_get_total", backend=supported_cache)
70+
self.assertMetricEquals(fail_before + 2, "django_cache_get_fail_total", backend=supported_cache)
10671

10772
def test_cache_version_support(self):
10873
supported_caches = [

0 commit comments

Comments
 (0)