Skip to content

Commit 30140ec

Browse files
vsergiienkovsergiienko
committed
black and isort fixes
1 parent 14ec5d9 commit 30140ec

File tree

6 files changed

+59
-45
lines changed

6 files changed

+59
-45
lines changed

‎django_prometheus/cache/metrics.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,26 @@
33
from django_prometheus.conf import NAMESPACE
44

55
django_cache_get_total = Counter(
6-
"django_cache_get_total", "Total get requests on cache", ["backend"],
7-
namespace=NAMESPACE
6+
"django_cache_get_total",
7+
"Total get requests on cache",
8+
["backend"],
9+
namespace=NAMESPACE,
810
)
911
django_cache_hits_total = Counter(
10-
"django_cache_get_hits_total", "Total hits on cache", ["backend"],
11-
namespace=NAMESPACE
12+
"django_cache_get_hits_total",
13+
"Total hits on cache",
14+
["backend"],
15+
namespace=NAMESPACE,
1216
)
1317
django_cache_misses_total = Counter(
14-
"django_cache_get_misses_total", "Total misses on cache", ["backend"],
15-
namespace=NAMESPACE
18+
"django_cache_get_misses_total",
19+
"Total misses on cache",
20+
["backend"],
21+
namespace=NAMESPACE,
1622
)
1723
django_cache_get_fail_total = Counter(
18-
"django_cache_get_fail_total", "Total get request failures by cache", ["backend"],
19-
namespace=NAMESPACE
24+
"django_cache_get_fail_total",
25+
"Total get request failures by cache",
26+
["backend"],
27+
namespace=NAMESPACE,
2028
)

‎django_prometheus/conf/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
if not settings.configured:
44
settings.configure()
55

6-
NAMESPACE = getattr(settings, 'PROMETHEUS_METRIC_NAMESPACE', '')
6+
NAMESPACE = getattr(settings, "PROMETHEUS_METRIC_NAMESPACE", "")

‎django_prometheus/db/metrics.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"django_db_new_connections_total",
77
"Counter of created connections by database and by vendor.",
88
["alias", "vendor"],
9-
namespace=NAMESPACE
9+
namespace=NAMESPACE,
1010
)
1111

1212
connection_errors_total = Counter(
1313
"django_db_new_connection_errors_total",
1414
"Counter of connection failures by database and by vendor.",
1515
["alias", "vendor"],
16-
namespace=NAMESPACE
16+
namespace=NAMESPACE,
1717
)
1818

1919
execute_total = Counter(
@@ -23,21 +23,21 @@
2323
" bulk executions."
2424
),
2525
["alias", "vendor"],
26-
namespace=NAMESPACE
26+
namespace=NAMESPACE,
2727
)
2828

2929

3030
execute_many_total = Counter(
3131
"django_db_execute_many_total",
3232
("Counter of executed statements in bulk operations by database and" " by vendor."),
3333
["alias", "vendor"],
34-
namespace=NAMESPACE
34+
namespace=NAMESPACE,
3535
)
3636

3737

3838
errors_total = Counter(
3939
"django_db_errors_total",
4040
("Counter of execution errors by database, vendor and exception type."),
4141
["alias", "vendor", "type"],
42-
namespace=NAMESPACE
42+
namespace=NAMESPACE,
4343
)

‎django_prometheus/middleware.py

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
from django.conf import settings
44
from django.utils.deprecation import MiddlewareMixin
5-
from django_prometheus.utils import PowersOf, Time, TimeSince
6-
75
from django_prometheus.conf import NAMESPACE
6+
from django_prometheus.utils import PowersOf, Time, TimeSince
87

98
DEFAULT_LATENCY_BUCKETS = (
109
0.01,
@@ -49,13 +48,13 @@ def register(self):
4948
Counter,
5049
"django_http_requests_before_middlewares_total",
5150
"Total count of requests before middlewares run.",
52-
namespace=NAMESPACE
51+
namespace=NAMESPACE,
5352
)
5453
self.responses_total = self.register_metric(
5554
Counter,
5655
"django_http_responses_before_middlewares_total",
5756
"Total count of responses before middlewares run.",
58-
namespace=NAMESPACE
57+
namespace=NAMESPACE,
5958
)
6059
self.requests_latency_before = self.register_metric(
6160
Histogram,
@@ -64,7 +63,7 @@ def register(self):
6463
"Histogram of requests processing time (including middleware "
6564
"processing time)."
6665
),
67-
namespace=NAMESPACE
66+
namespace=NAMESPACE,
6867
)
6968
self.requests_unknown_latency_before = self.register_metric(
7069
Counter,
@@ -73,7 +72,7 @@ def register(self):
7372
"Count of requests for which the latency was unknown (when computing "
7473
"django_http_requests_latency_including_middlewares_seconds)."
7574
),
76-
namespace=NAMESPACE
75+
namespace=NAMESPACE,
7776
)
7877
self.requests_latency_by_view_method = self.register_metric(
7978
Histogram,
@@ -83,105 +82,107 @@ def register(self):
8382
buckets=getattr(
8483
settings, "PROMETHEUS_LATENCY_BUCKETS", DEFAULT_LATENCY_BUCKETS
8584
),
86-
namespace=NAMESPACE
85+
namespace=NAMESPACE,
8786
)
8887
self.requests_unknown_latency = self.register_metric(
8988
Counter,
9089
"django_http_requests_unknown_latency_total",
9190
"Count of requests for which the latency was unknown.",
92-
namespace=NAMESPACE
91+
namespace=NAMESPACE,
9392
)
9493
# Set in process_request
9594
self.requests_ajax = self.register_metric(
96-
Counter, "django_http_ajax_requests_total", "Count of AJAX requests.",
97-
namespace=NAMESPACE
95+
Counter,
96+
"django_http_ajax_requests_total",
97+
"Count of AJAX requests.",
98+
namespace=NAMESPACE,
9899
)
99100
self.requests_by_method = self.register_metric(
100101
Counter,
101102
"django_http_requests_total_by_method",
102103
"Count of requests by method.",
103104
["method"],
104-
namespace=NAMESPACE
105+
namespace=NAMESPACE,
105106
)
106107
self.requests_by_transport = self.register_metric(
107108
Counter,
108109
"django_http_requests_total_by_transport",
109110
"Count of requests by transport.",
110111
["transport"],
111-
namespace=NAMESPACE
112+
namespace=NAMESPACE,
112113
)
113114
# Set in process_view
114115
self.requests_by_view_transport_method = self.register_metric(
115116
Counter,
116117
"django_http_requests_total_by_view_transport_method",
117118
"Count of requests by view, transport, method.",
118119
["view", "transport", "method"],
119-
namespace=NAMESPACE
120+
namespace=NAMESPACE,
120121
)
121122
self.requests_body_bytes = self.register_metric(
122123
Histogram,
123124
"django_http_requests_body_total_bytes",
124125
"Histogram of requests by body size.",
125126
buckets=PowersOf(2, 30),
126-
namespace=NAMESPACE
127+
namespace=NAMESPACE,
127128
)
128129
# Set in process_template_response
129130
self.responses_by_templatename = self.register_metric(
130131
Counter,
131132
"django_http_responses_total_by_templatename",
132133
"Count of responses by template name.",
133134
["templatename"],
134-
namespace=NAMESPACE
135+
namespace=NAMESPACE,
135136
)
136137
# Set in process_response
137138
self.responses_by_status = self.register_metric(
138139
Counter,
139140
"django_http_responses_total_by_status",
140141
"Count of responses by status.",
141142
["status"],
142-
namespace=NAMESPACE
143+
namespace=NAMESPACE,
143144
)
144145
self.responses_by_status_view_method = self.register_metric(
145146
Counter,
146147
"django_http_responses_total_by_status_view_method",
147148
"Count of responses by status, view, method.",
148149
["status", "view", "method"],
149-
namespace=NAMESPACE
150+
namespace=NAMESPACE,
150151
)
151152
self.responses_body_bytes = self.register_metric(
152153
Histogram,
153154
"django_http_responses_body_total_bytes",
154155
"Histogram of responses by body size.",
155156
buckets=PowersOf(2, 30),
156-
namespace=NAMESPACE
157+
namespace=NAMESPACE,
157158
)
158159
self.responses_by_charset = self.register_metric(
159160
Counter,
160161
"django_http_responses_total_by_charset",
161162
"Count of responses by charset.",
162163
["charset"],
163-
namespace=NAMESPACE
164+
namespace=NAMESPACE,
164165
)
165166
self.responses_streaming = self.register_metric(
166167
Counter,
167168
"django_http_responses_streaming_total",
168169
"Count of streaming responses.",
169-
namespace=NAMESPACE
170+
namespace=NAMESPACE,
170171
)
171172
# Set in process_exception
172173
self.exceptions_by_type = self.register_metric(
173174
Counter,
174175
"django_http_exceptions_total_by_type",
175176
"Count of exceptions by object type.",
176177
["type"],
177-
namespace=NAMESPACE
178+
namespace=NAMESPACE,
178179
)
179180
self.exceptions_by_view = self.register_metric(
180181
Counter,
181182
"django_http_exceptions_total_by_view",
182183
"Count of exceptions by view.",
183184
["view"],
184-
namespace=NAMESPACE
185+
namespace=NAMESPACE,
185186
)
186187

187188

‎django_prometheus/migrations.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22

33
from django.db import connections
44
from django.db.backends.dummy.base import DatabaseWrapper
5-
65
from django_prometheus.conf import NAMESPACE
76

87
unapplied_migrations = Gauge(
98
"django_migrations_unapplied_total",
109
"Count of unapplied migrations by database connection",
1110
["connection"],
12-
namespace=NAMESPACE
11+
namespace=NAMESPACE,
1312
)
1413

1514
applied_migrations = Gauge(
1615
"django_migrations_applied_total",
1716
"Count of applied migrations by database connection",
1817
["connection"],
19-
namespace=NAMESPACE
18+
namespace=NAMESPACE,
2019
)
2120

2221

‎django_prometheus/models.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,24 @@
33
from django_prometheus.conf import NAMESPACE
44

55
model_inserts = Counter(
6-
"django_model_inserts_total", "Number of insert operations by model.", ["model"],
7-
namespace=NAMESPACE
6+
"django_model_inserts_total",
7+
"Number of insert operations by model.",
8+
["model"],
9+
namespace=NAMESPACE,
810
)
911

1012
model_updates = Counter(
11-
"django_model_updates_total", "Number of update operations by model.", ["model"],
12-
namespace=NAMESPACE
13+
"django_model_updates_total",
14+
"Number of update operations by model.",
15+
["model"],
16+
namespace=NAMESPACE,
1317
)
1418

1519
model_deletes = Counter(
16-
"django_model_deletes_total", "Number of delete operations by model.", ["model"],
17-
namespace=NAMESPACE
20+
"django_model_deletes_total",
21+
"Number of delete operations by model.",
22+
["model"],
23+
namespace=NAMESPACE,
1824
)
1925

2026

0 commit comments

Comments
 (0)