Skip to content

Commit 25438ab

Browse files
allen-k1mocelotl
authored andcommitted
modify flask version
1 parent aac38cc commit 25438ab

File tree

1 file changed

+29
-29
lines changed
  • instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask

1 file changed

+29
-29
lines changed

instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py

+29-29
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def response_hook(span: Span, status: str, response_headers: List):
254254

255255
try:
256256
flask_version = flask.__version__
257-
except Exception as e:
257+
except AttributeError:
258258
try:
259259
from importlib import metadata
260260
except ImportError:
@@ -304,11 +304,11 @@ def get_default_span_name():
304304

305305

306306
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,
312312
):
313313
def _wrapped_app(wrapped_app_environ, start_response):
314314
# We want to measure the time for route matching, etc.
@@ -326,8 +326,8 @@ def _wrapped_app(wrapped_app_environ, start_response):
326326

327327
def _start_response(status, response_headers, *args, **kwargs):
328328
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)
331331
):
332332
span = flask.request.environ.get(_ENVIRON_SPAN_KEY)
333333

@@ -348,8 +348,8 @@ def _start_response(status, response_headers, *args, **kwargs):
348348
SpanAttributes.HTTP_STATUS_CODE
349349
] = status_code
350350
if (
351-
span.is_recording()
352-
and span.kind == trace.SpanKind.SERVER
351+
span.is_recording()
352+
and span.kind == trace.SpanKind.SERVER
353353
):
354354
custom_attributes = otel_wsgi.collect_custom_response_headers_attributes(
355355
response_headers
@@ -376,11 +376,11 @@ def _start_response(status, response_headers, *args, **kwargs):
376376

377377

378378
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,
384384
):
385385
def _before_request():
386386
if excluded_urls and excluded_urls.url_disabled(flask.request.url):
@@ -435,14 +435,14 @@ def _before_request():
435435
if commenter_options.get("framework", True):
436436
flask_info["framework"] = f"flask:{flask_version}"
437437
if (
438-
commenter_options.get("controller", True)
439-
and flask.request.endpoint
438+
commenter_options.get("controller", True)
439+
and flask.request.endpoint
440440
):
441441
flask_info["controller"] = flask.request.endpoint
442442
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
446446
):
447447
flask_info["route"] = flask.request.url_rule.rule
448448
sqlcommenter_context = context.set_value(
@@ -454,7 +454,7 @@ def _before_request():
454454

455455

456456
def _wrapped_teardown_request(
457-
excluded_urls=None,
457+
excluded_urls=None,
458458
):
459459
def _teardown_request(exc):
460460
# pylint: disable=E1101
@@ -595,14 +595,14 @@ def _uninstrument(self, **kwargs):
595595

596596
@staticmethod
597597
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,
606606
):
607607
if not hasattr(app, "_is_instrumented_by_opentelemetry"):
608608
app._is_instrumented_by_opentelemetry = False

0 commit comments

Comments
 (0)