@@ -254,7 +254,7 @@ def response_hook(span: Span, status: str, response_headers: List):
254
254
255
255
try :
256
256
flask_version = flask .__version__
257
- except Exception as e :
257
+ except AttributeError :
258
258
try :
259
259
from importlib import metadata
260
260
except ImportError :
@@ -304,11 +304,11 @@ def get_default_span_name():
304
304
305
305
306
306
def _rewrapped_app (
307
- wsgi_app ,
308
- active_requests_counter ,
309
- duration_histogram ,
310
- response_hook = None ,
311
- excluded_urls = None ,
307
+ wsgi_app ,
308
+ active_requests_counter ,
309
+ duration_histogram ,
310
+ response_hook = None ,
311
+ excluded_urls = None ,
312
312
):
313
313
def _wrapped_app (wrapped_app_environ , start_response ):
314
314
# We want to measure the time for route matching, etc.
@@ -326,8 +326,8 @@ def _wrapped_app(wrapped_app_environ, start_response):
326
326
327
327
def _start_response (status , response_headers , * args , ** kwargs ):
328
328
if flask .request and (
329
- excluded_urls is None
330
- or not excluded_urls .url_disabled (flask .request .url )
329
+ excluded_urls is None
330
+ or not excluded_urls .url_disabled (flask .request .url )
331
331
):
332
332
span = flask .request .environ .get (_ENVIRON_SPAN_KEY )
333
333
@@ -348,8 +348,8 @@ def _start_response(status, response_headers, *args, **kwargs):
348
348
SpanAttributes .HTTP_STATUS_CODE
349
349
] = status_code
350
350
if (
351
- span .is_recording ()
352
- and span .kind == trace .SpanKind .SERVER
351
+ span .is_recording ()
352
+ and span .kind == trace .SpanKind .SERVER
353
353
):
354
354
custom_attributes = otel_wsgi .collect_custom_response_headers_attributes (
355
355
response_headers
@@ -376,11 +376,11 @@ def _start_response(status, response_headers, *args, **kwargs):
376
376
377
377
378
378
def _wrapped_before_request (
379
- request_hook = None ,
380
- tracer = None ,
381
- excluded_urls = None ,
382
- enable_commenter = True ,
383
- commenter_options = None ,
379
+ request_hook = None ,
380
+ tracer = None ,
381
+ excluded_urls = None ,
382
+ enable_commenter = True ,
383
+ commenter_options = None ,
384
384
):
385
385
def _before_request ():
386
386
if excluded_urls and excluded_urls .url_disabled (flask .request .url ):
@@ -435,14 +435,14 @@ def _before_request():
435
435
if commenter_options .get ("framework" , True ):
436
436
flask_info ["framework" ] = f"flask:{ flask_version } "
437
437
if (
438
- commenter_options .get ("controller" , True )
439
- and flask .request .endpoint
438
+ commenter_options .get ("controller" , True )
439
+ and flask .request .endpoint
440
440
):
441
441
flask_info ["controller" ] = flask .request .endpoint
442
442
if (
443
- commenter_options .get ("route" , True )
444
- and flask .request .url_rule
445
- and flask .request .url_rule .rule
443
+ commenter_options .get ("route" , True )
444
+ and flask .request .url_rule
445
+ and flask .request .url_rule .rule
446
446
):
447
447
flask_info ["route" ] = flask .request .url_rule .rule
448
448
sqlcommenter_context = context .set_value (
@@ -454,7 +454,7 @@ def _before_request():
454
454
455
455
456
456
def _wrapped_teardown_request (
457
- excluded_urls = None ,
457
+ excluded_urls = None ,
458
458
):
459
459
def _teardown_request (exc ):
460
460
# pylint: disable=E1101
@@ -595,14 +595,14 @@ def _uninstrument(self, **kwargs):
595
595
596
596
@staticmethod
597
597
def instrument_app (
598
- app ,
599
- request_hook = None ,
600
- response_hook = None ,
601
- tracer_provider = None ,
602
- excluded_urls = None ,
603
- enable_commenter = True ,
604
- commenter_options = None ,
605
- meter_provider = None ,
598
+ app ,
599
+ request_hook = None ,
600
+ response_hook = None ,
601
+ tracer_provider = None ,
602
+ excluded_urls = None ,
603
+ enable_commenter = True ,
604
+ commenter_options = None ,
605
+ meter_provider = None ,
606
606
):
607
607
if not hasattr (app , "_is_instrumented_by_opentelemetry" ):
608
608
app ._is_instrumented_by_opentelemetry = False
0 commit comments