Skip to content

Commit 4a57b3e

Browse files
committed
run precommit hooks
1 parent b679ee1 commit 4a57b3e

File tree

2 files changed

+36
-13
lines changed

2 files changed

+36
-13
lines changed

instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,24 +228,32 @@ def keys(self, carrier: Dict) -> List:
228228

229229
getter = AiohttpGetter()
230230

231-
def create_aiohttp_middleware(tracer_provider: trace.TracerProvider | None = None):
232-
_tracer = tracer_provider.get_tracer(
233-
__name__, __version__
234-
) if tracer_provider else tracer
231+
232+
def create_aiohttp_middleware(
233+
tracer_provider: trace.TracerProvider | None = None,
234+
):
235+
_tracer = (
236+
tracer_provider.get_tracer(__name__, __version__)
237+
if tracer_provider
238+
else tracer
239+
)
235240

236241
@web.middleware
237242
async def _middleware(request, handler):
238243
"""Middleware for aiohttp implementing tracing logic"""
239-
if not is_http_instrumentation_enabled() or _excluded_urls.url_disabled(
240-
request.url.path
244+
if (
245+
not is_http_instrumentation_enabled()
246+
or _excluded_urls.url_disabled(request.url.path)
241247
):
242248
return await handler(request)
243249

244250
span_name, additional_attributes = get_default_span_details(request)
245251

246252
req_attrs = collect_request_attributes(request)
247253
duration_attrs = _parse_duration_attrs(req_attrs)
248-
active_requests_count_attrs = _parse_active_request_count_attrs(req_attrs)
254+
active_requests_count_attrs = _parse_active_request_count_attrs(
255+
req_attrs
256+
)
249257

250258
duration_histogram = meter.create_histogram(
251259
name=MetricInstruments.HTTP_SERVER_DURATION,
@@ -280,13 +288,18 @@ async def _middleware(request, handler):
280288
duration_histogram.record(duration, duration_attrs)
281289
active_requests_counter.add(-1, active_requests_count_attrs)
282290
return resp
291+
283292
return _middleware
284293

285-
middleware = create_aiohttp_middleware() # for backwards compatibility
286294

295+
middleware = create_aiohttp_middleware() # for backwards compatibility
287296

288-
def create_instrumented_application(tracer_provider: trace.TracerProvider | None = None):
297+
298+
def create_instrumented_application(
299+
tracer_provider: trace.TracerProvider | None = None,
300+
):
289301
_middleware = create_aiohttp_middleware(tracer_provider=tracer_provider)
302+
290303
class _InstrumentedApplication(web.Application):
291304
"""Insert tracing middleware"""
292305

@@ -298,6 +311,7 @@ def __init__(self, *args, **kwargs):
298311

299312
return _InstrumentedApplication
300313

314+
301315
class AioHttpServerInstrumentor(BaseInstrumentor):
302316
# pylint: disable=protected-access,attribute-defined-outside-init
303317
"""An instrumentor for aiohttp.web.Application

instrumentation/opentelemetry-instrumentation-aiohttp-server/tests/test_aiohttp_server_integration.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
AioHttpServerInstrumentor,
2525
)
2626
from opentelemetry.instrumentation.utils import suppress_http_instrumentation
27+
from opentelemetry.sdk.trace.sampling import ParentBased, TraceIdRatioBased
2728
from opentelemetry.semconv._incubating.attributes.http_attributes import (
2829
HTTP_METHOD,
2930
HTTP_STATUS_CODE,
@@ -32,7 +33,7 @@
3233
from opentelemetry.test.globals_test import reset_trace_globals
3334
from opentelemetry.test.test_base import TestBase
3435
from opentelemetry.util._importlib_metadata import entry_points
35-
from opentelemetry.sdk.trace.sampling import ParentBased, TraceIdRatioBased
36+
3637

3738
class HTTPMethod(Enum):
3839
"""HTTP methods and descriptions"""
@@ -197,10 +198,14 @@ async def handler(request):
197198
memory_exporter.clear()
198199

199200

200-
201201
@pytest.mark.asyncio
202202
@pytest.mark.parametrize(
203-
"tracer", [TestBase().create_tracer_provider(sampler=ParentBased(TraceIdRatioBased(0.05)))]
203+
"tracer",
204+
[
205+
TestBase().create_tracer_provider(
206+
sampler=ParentBased(TraceIdRatioBased(0.05))
207+
)
208+
],
204209
)
205210
async def test_non_global_tracer_provider(
206211
tracer,
@@ -225,4 +230,8 @@ async def test_non_global_tracer_provider(
225230
for span in memory_exporter.get_finished_spans()
226231
if span.context is not None
227232
}
228-
assert 0.5 * n_expected_trace_ids <= len(trace_ids) <= 1.5 * n_expected_trace_ids
233+
assert (
234+
0.5 * n_expected_trace_ids
235+
<= len(trace_ids)
236+
<= 1.5 * n_expected_trace_ids
237+
)

0 commit comments

Comments
 (0)