Skip to content

Commit 8200f0b

Browse files
ebrachoocelotl
ebracho
authored and
ocelotl
committed
run black
1 parent 354405d commit 8200f0b

File tree

6 files changed

+50
-140
lines changed

6 files changed

+50
-140
lines changed

‎instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,7 @@ def _instrument(self, **kwargs):
316316
else parse_excluded_urls(_excluded_urls)
317317
)
318318
_DjangoMiddleware._otel_request_hook = kwargs.pop("request_hook", None)
319-
_DjangoMiddleware._otel_response_hook = kwargs.pop(
320-
"response_hook", None
321-
)
319+
_DjangoMiddleware._otel_response_hook = kwargs.pop("response_hook", None)
322320
_DjangoMiddleware._duration_histogram = meter.create_histogram(
323321
name=MetricInstruments.HTTP_SERVER_DURATION,
324322
unit="ms",

‎instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware/otel_middleware.py

+10-22
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,14 @@ def _is_asgi_request(request: HttpRequest) -> bool:
142142
class _DjangoMiddleware(MiddlewareMixin):
143143
"""Django Middleware for OpenTelemetry"""
144144

145-
_environ_activation_key = (
146-
"opentelemetry-instrumentor-django.activation_key"
147-
)
145+
_environ_activation_key = "opentelemetry-instrumentor-django.activation_key"
148146
_environ_token = "opentelemetry-instrumentor-django.token"
149147
_environ_span_key = "opentelemetry-instrumentor-django.span_key"
150148
_environ_exception_key = "opentelemetry-instrumentor-django.exception_key"
151149
_environ_active_request_attr_key = (
152150
"opentelemetry-instrumentor-django.active_request_attr_key"
153151
)
154-
_environ_duration_attr_key = (
155-
"opentelemetry-instrumentor-django.duration_attr_key"
156-
)
152+
_environ_duration_attr_key = "opentelemetry-instrumentor-django.duration_attr_key"
157153
_environ_timer_key = "opentelemetry-instrumentor-django.timer_key"
158154
_traced_request_attrs = get_traced_request_attrs("DJANGO")
159155
_excluded_urls = get_excluded_urls("DJANGO")
@@ -224,9 +220,7 @@ def process_request(self, request):
224220
attributes=attributes,
225221
)
226222

227-
active_requests_count_attrs = _parse_active_request_count_attrs(
228-
attributes
229-
)
223+
active_requests_count_attrs = _parse_active_request_count_attrs(attributes)
230224
duration_attrs = _parse_duration_attrs(attributes)
231225

232226
request.META[self._environ_active_request_attr_key] = (
@@ -267,8 +261,8 @@ def process_request(self, request):
267261
)
268262
else:
269263
if span.is_recording() and span.kind == SpanKind.SERVER:
270-
custom_attributes = (
271-
wsgi_collect_custom_request_headers_attributes(carrier)
264+
custom_attributes = wsgi_collect_custom_request_headers_attributes(
265+
carrier
272266
)
273267
if len(custom_attributes) > 0:
274268
span.set_attributes(custom_attributes)
@@ -343,9 +337,7 @@ def process_response(self, request, response):
343337
active_requests_count_attrs = request.META.pop(
344338
self._environ_active_request_attr_key, None
345339
)
346-
duration_attrs = request.META.pop(
347-
self._environ_duration_attr_key, None
348-
)
340+
duration_attrs = request.META.pop(self._environ_duration_attr_key, None)
349341
if duration_attrs:
350342
duration_attrs[SpanAttributes.HTTP_STATUS_CODE] = (
351343
response.status_code
@@ -384,10 +376,8 @@ def process_response(self, request, response):
384376
response.items(),
385377
)
386378
if span.is_recording() and span.kind == SpanKind.SERVER:
387-
custom_attributes = (
388-
wsgi_collect_custom_response_headers_attributes(
389-
response.items()
390-
)
379+
custom_attributes = wsgi_collect_custom_response_headers_attributes(
380+
response.items()
391381
)
392382
if len(custom_attributes) > 0:
393383
span.set_attributes(custom_attributes)
@@ -422,15 +412,13 @@ def process_response(self, request, response):
422412
activation.__exit__(None, None, None)
423413

424414
if request_start_time is not None:
425-
duration = max(
426-
round((default_timer() - request_start_time) * 1000), 0
427-
)
415+
duration = max(round((default_timer() - request_start_time) * 1000), 0)
428416
self._duration_histogram.record(duration, duration_attrs)
429417
self._active_request_counter.add(-1, active_requests_count_attrs)
430418
if request.META.get(self._environ_token, None) is not None:
431419
detach(request.META.get(self._environ_token))
432420
request.META.pop(self._environ_token)
433-
421+
434422
if response_hook_exception is not None:
435423
raise response_hook_exception
436424

‎instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware/sqlcommenter_middleware.py

+5-15
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ def __call__(self, request) -> Any:
4747
with ExitStack() as stack:
4848
for db_alias in connections:
4949
stack.enter_context(
50-
connections[db_alias].execute_wrapper(
51-
_QueryWrapper(request)
52-
)
50+
connections[db_alias].execute_wrapper(_QueryWrapper(request))
5351
)
5452
return self.get_response(request)
5553

@@ -60,22 +58,14 @@ def __init__(self, request) -> None:
6058

6159
def __call__(self, execute: Type[T], sql, params, many, context) -> T:
6260
# pylint: disable-msg=too-many-locals
63-
with_framework = getattr(
64-
conf.settings, "SQLCOMMENTER_WITH_FRAMEWORK", True
65-
)
66-
with_controller = getattr(
67-
conf.settings, "SQLCOMMENTER_WITH_CONTROLLER", True
68-
)
61+
with_framework = getattr(conf.settings, "SQLCOMMENTER_WITH_FRAMEWORK", True)
62+
with_controller = getattr(conf.settings, "SQLCOMMENTER_WITH_CONTROLLER", True)
6963
with_route = getattr(conf.settings, "SQLCOMMENTER_WITH_ROUTE", True)
70-
with_app_name = getattr(
71-
conf.settings, "SQLCOMMENTER_WITH_APP_NAME", True
72-
)
64+
with_app_name = getattr(conf.settings, "SQLCOMMENTER_WITH_APP_NAME", True)
7365
with_opentelemetry = getattr(
7466
conf.settings, "SQLCOMMENTER_WITH_OPENTELEMETRY", True
7567
)
76-
with_db_driver = getattr(
77-
conf.settings, "SQLCOMMENTER_WITH_DB_DRIVER", True
78-
)
68+
with_db_driver = getattr(conf.settings, "SQLCOMMENTER_WITH_DB_DRIVER", True)
7969

8070
db_driver = context["connection"].settings_dict.get("ENGINE", "")
8171
resolver_match = self.request.resolver_match

‎instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py

+18-52
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,7 @@ def test_traced_get(self):
193193
"http://testserver/traced/",
194194
)
195195
if DJANGO_2_2:
196-
self.assertEqual(
197-
span.attributes[SpanAttributes.HTTP_ROUTE], "^traced/"
198-
)
196+
self.assertEqual(span.attributes[SpanAttributes.HTTP_ROUTE], "^traced/")
199197
self.assertEqual(span.attributes[SpanAttributes.HTTP_SCHEME], "http")
200198
self.assertEqual(span.attributes[SpanAttributes.HTTP_STATUS_CODE], 200)
201199

@@ -239,9 +237,7 @@ def test_traced_post(self):
239237
"http://testserver/traced/",
240238
)
241239
if DJANGO_2_2:
242-
self.assertEqual(
243-
span.attributes[SpanAttributes.HTTP_ROUTE], "^traced/"
244-
)
240+
self.assertEqual(span.attributes[SpanAttributes.HTTP_ROUTE], "^traced/")
245241
self.assertEqual(span.attributes[SpanAttributes.HTTP_SCHEME], "http")
246242
self.assertEqual(span.attributes[SpanAttributes.HTTP_STATUS_CODE], 200)
247243

@@ -263,21 +259,15 @@ def test_error(self):
263259
"http://testserver/error/",
264260
)
265261
if DJANGO_2_2:
266-
self.assertEqual(
267-
span.attributes[SpanAttributes.HTTP_ROUTE], "^error/"
268-
)
262+
self.assertEqual(span.attributes[SpanAttributes.HTTP_ROUTE], "^error/")
269263
self.assertEqual(span.attributes[SpanAttributes.HTTP_SCHEME], "http")
270264
self.assertEqual(span.attributes[SpanAttributes.HTTP_STATUS_CODE], 500)
271265

272266
self.assertEqual(len(span.events), 1)
273267
event = span.events[0]
274268
self.assertEqual(event.name, "exception")
275-
self.assertEqual(
276-
event.attributes[SpanAttributes.EXCEPTION_TYPE], "ValueError"
277-
)
278-
self.assertEqual(
279-
event.attributes[SpanAttributes.EXCEPTION_MESSAGE], "error"
280-
)
269+
self.assertEqual(event.attributes[SpanAttributes.EXCEPTION_TYPE], "ValueError")
270+
self.assertEqual(event.attributes[SpanAttributes.EXCEPTION_MESSAGE], "error")
281271

282272
def test_exclude_lists(self):
283273
client = Client()
@@ -391,9 +381,8 @@ def response_hook(span, request, response):
391381
self.assertIsInstance(response_hook_args[1], HttpRequest)
392382
self.assertIsInstance(response_hook_args[2], HttpResponse)
393383
self.assertEqual(response_hook_args[2], response)
394-
395-
def test_request_hook_exception(self):
396384

385+
def test_request_hook_exception(self):
397386
class RequestHookException(Exception):
398387
pass
399388

@@ -409,9 +398,8 @@ def request_hook(span, request):
409398
finished_spans = self.memory_exporter.get_finished_spans()
410399
self.assertEqual(len(finished_spans), 1)
411400
self.assertEquals(finished_spans[0].status.status_code, StatusCode.ERROR)
412-
413-
def test_response_hook_exception(self):
414401

402+
def test_response_hook_exception(self):
415403
class ResponseHookException(Exception):
416404
pass
417405

@@ -522,16 +510,12 @@ def test_wsgi_metrics(self):
522510
if isinstance(point, HistogramDataPoint):
523511
self.assertEqual(point.count, 3)
524512
histrogram_data_point_seen = True
525-
self.assertAlmostEqual(
526-
duration, point.sum, delta=100
527-
)
513+
self.assertAlmostEqual(duration, point.sum, delta=100)
528514
if isinstance(point, NumberDataPoint):
529515
number_data_point_seen = True
530516
self.assertEqual(point.value, 0)
531517
for attr in point.attributes:
532-
self.assertIn(
533-
attr, _recommended_attrs[metric.name]
534-
)
518+
self.assertIn(attr, _recommended_attrs[metric.name])
535519
self.assertTrue(histrogram_data_point_seen and number_data_point_seen)
536520

537521
def test_wsgi_metrics_unistrument(self):
@@ -558,9 +542,7 @@ def setUpClass(cls):
558542
def setUp(self):
559543
super().setUp()
560544
setup_test_environment()
561-
resource = resources.Resource.create(
562-
{"resource-key": "resource-value"}
563-
)
545+
resource = resources.Resource.create({"resource-key": "resource-value"})
564546
result = self.create_tracer_provider(resource=resource)
565547
tracer_provider, exporter = result
566548
self.exporter = exporter
@@ -585,15 +567,11 @@ def test_tracer_provider_traced(self):
585567

586568
span = spans[0]
587569

588-
self.assertEqual(
589-
span.resource.attributes["resource-key"], "resource-value"
590-
)
570+
self.assertEqual(span.resource.attributes["resource-key"], "resource-value")
591571

592572
def test_django_with_wsgi_instrumented(self):
593573
tracer = self.tracer_provider.get_tracer(__name__)
594-
with tracer.start_as_current_span(
595-
"test", kind=SpanKind.SERVER
596-
) as parent_span:
574+
with tracer.start_as_current_span("test", kind=SpanKind.SERVER) as parent_span:
597575
Client().get("/span_name/1234/")
598576
span_list = self.exporter.get_finished_spans()
599577
print(span_list)
@@ -640,12 +618,8 @@ def tearDownClass(cls):
640618

641619
def test_http_custom_request_headers_in_span_attributes(self):
642620
expected = {
643-
"http.request.header.custom_test_header_1": (
644-
"test-header-value-1",
645-
),
646-
"http.request.header.custom_test_header_2": (
647-
"test-header-value-2",
648-
),
621+
"http.request.header.custom_test_header_1": ("test-header-value-1",),
622+
"http.request.header.custom_test_header_2": ("test-header-value-2",),
649623
"http.request.header.regex_test_header_1": ("Regex Test Value 1",),
650624
"http.request.header.regex_test_header_2": (
651625
"RegexTestValue2,RegexTestValue3",
@@ -669,9 +643,7 @@ def test_http_custom_request_headers_in_span_attributes(self):
669643

670644
def test_http_custom_request_headers_not_in_span_attributes(self):
671645
not_expected = {
672-
"http.request.header.custom_test_header_2": (
673-
"test-header-value-2",
674-
),
646+
"http.request.header.custom_test_header_2": ("test-header-value-2",),
675647
}
676648
Client(HTTP_CUSTOM_TEST_HEADER_1="test-header-value-1").get("/traced/")
677649
spans = self.exporter.get_finished_spans()
@@ -685,12 +657,8 @@ def test_http_custom_request_headers_not_in_span_attributes(self):
685657

686658
def test_http_custom_response_headers_in_span_attributes(self):
687659
expected = {
688-
"http.response.header.custom_test_header_1": (
689-
"test-header-value-1",
690-
),
691-
"http.response.header.custom_test_header_2": (
692-
"test-header-value-2",
693-
),
660+
"http.response.header.custom_test_header_1": ("test-header-value-1",),
661+
"http.response.header.custom_test_header_2": ("test-header-value-2",),
694662
"http.response.header.my_custom_regex_header_1": (
695663
"my-custom-regex-value-1,my-custom-regex-value-2",
696664
),
@@ -710,9 +678,7 @@ def test_http_custom_response_headers_in_span_attributes(self):
710678

711679
def test_http_custom_response_headers_not_in_span_attributes(self):
712680
not_expected = {
713-
"http.response.header.custom_test_header_3": (
714-
"test-header-value-3",
715-
),
681+
"http.response.header.custom_test_header_3": ("test-header-value-3",),
716682
}
717683
Client().get("/traced_custom_header/")
718684
spans = self.exporter.get_finished_spans()

0 commit comments

Comments
 (0)