Skip to content

Commit cff7e9e

Browse files
committed
fix lint
1 parent af1776c commit cff7e9e

File tree

3 files changed

+31
-20
lines changed

3 files changed

+31
-20
lines changed

Diff for: instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,18 @@ def _instrument(self, **kwargs):
360360
_logger.debug(
361361
"The middleware_position you provided (%d) is less than the current number of middlewares (%d). \
362362
Since the number of middlewares is less than the total, the Otel middleware will be appended at the end of the middleware chain.",
363-
middleware_position, len(settings_middleware)
363+
middleware_position,
364+
len(settings_middleware),
364365
)
365366
middleware_position = len(settings_middleware)
366367
if is_sql_commentor_enabled:
367-
settings_middleware.insert(middleware_position, self._sql_commenter_middleware)
368+
settings_middleware.insert(
369+
middleware_position, self._sql_commenter_middleware
370+
)
368371

369-
settings_middleware.insert(middleware_position, self._opentelemetry_middleware)
372+
settings_middleware.insert(
373+
middleware_position, self._opentelemetry_middleware
374+
)
370375

371376
setattr(settings, _middleware_setting, settings_middleware)
372377

Diff for: instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py

+14-11
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
route_span_name,
6868
traced,
6969
traced_template,
70-
DummyMiddleware,
7170
)
7271

7372
DJANGO_2_0 = VERSION >= (2, 0)
@@ -145,7 +144,7 @@ def tearDown(self):
145144
def tearDownClass(cls):
146145
super().tearDownClass()
147146
conf.settings = conf.LazySettings()
148-
147+
149148
def test_middleware_added_at_position(self):
150149
_django_instrumentor.uninstrument()
151150
if DJANGO_2_0:
@@ -156,15 +155,16 @@ def test_middleware_added_at_position(self):
156155
temprory_middelware = "django.utils.deprecation.MiddlewareMixin"
157156
middleware.append(temprory_middelware)
158157
middleware.append(temprory_middelware)
159-
158+
160159
middleware_position = 1
161-
_django_instrumentor.instrument(middleware_position=middleware_position)
160+
_django_instrumentor.instrument(
161+
middleware_position=middleware_position
162+
)
162163
self.assertEqual(
163164
middleware[middleware_position],
164-
"opentelemetry.instrumentation.django.middleware.otel_middleware._DjangoMiddleware"
165+
"opentelemetry.instrumentation.django.middleware.otel_middleware._DjangoMiddleware",
165166
)
166-
167-
167+
168168
def test_middleware_added_at_position_if_wrong_position(self):
169169
_django_instrumentor.uninstrument()
170170
if DJANGO_2_0:
@@ -174,14 +174,17 @@ def test_middleware_added_at_position_if_wrong_position(self):
174174
# adding middleware
175175
temprory_middelware = "django.utils.deprecation.MiddlewareMixin"
176176
middleware.append(temprory_middelware)
177-
middleware_position = 756 # wrong position out of bound of middleware length
178-
_django_instrumentor.instrument(middleware_position=middleware_position)
177+
middleware_position = (
178+
756 # wrong position out of bound of middleware length
179+
)
180+
_django_instrumentor.instrument(
181+
middleware_position=middleware_position
182+
)
179183
self.assertEqual(
180184
middleware[len(middleware) - 1],
181-
"opentelemetry.instrumentation.django.middleware.otel_middleware._DjangoMiddleware"
185+
"opentelemetry.instrumentation.django.middleware.otel_middleware._DjangoMiddleware",
182186
)
183187

184-
185188
def test_templated_route_get(self):
186189
Client().get("/route/2020/template/")
187190

Diff for: instrumentation/opentelemetry-instrumentation-django/tests/test_sqlcommenter.py

+9-6
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def test_middleware_added(self, sqlcommenter_middleware):
7171
"opentelemetry.instrumentation.django.middleware.sqlcommenter_middleware.SqlCommenter"
7272
in middleware
7373
)
74-
74+
7575
@patch(
7676
"opentelemetry.instrumentation.django.middleware.sqlcommenter_middleware.SqlCommenter"
7777
)
@@ -81,23 +81,26 @@ def test_middleware_added_at_position(self, sqlcommenter_middleware):
8181
middleware = conf.settings.MIDDLEWARE
8282
else:
8383
middleware = conf.settings.MIDDLEWARE_CLASSES
84-
84+
8585
# adding two dummy middlewares
8686
temprory_middelware = "django.utils.deprecation.MiddlewareMixin"
8787
middleware.append(temprory_middelware)
8888
middleware.append(temprory_middelware)
89-
89+
9090
middleware_position = 1
91-
_django_instrumentor.instrument(is_sql_commentor_enabled=True, middleware_position=middleware_position)
91+
_django_instrumentor.instrument(
92+
is_sql_commentor_enabled=True,
93+
middleware_position=middleware_position,
94+
)
9295
instance = sqlcommenter_middleware.return_value
9396
instance.get_response = HttpResponse()
9497
self.assertEqual(
9598
middleware[middleware_position],
96-
"opentelemetry.instrumentation.django.middleware.otel_middleware._DjangoMiddleware"
99+
"opentelemetry.instrumentation.django.middleware.otel_middleware._DjangoMiddleware",
97100
)
98101
self.assertEqual(
99102
middleware[middleware_position + 1],
100-
"opentelemetry.instrumentation.django.middleware.sqlcommenter_middleware.SqlCommenter"
103+
"opentelemetry.instrumentation.django.middleware.sqlcommenter_middleware.SqlCommenter",
101104
)
102105

103106
@patch(

0 commit comments

Comments
 (0)