Skip to content

fix: use importlib.metadata instead of deprecated flask.__version__ #4403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bahtya wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −3
Open

fix: use importlib.metadata instead of deprecated flask.__version__ #4403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...n/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,12 @@ def response_hook(span: Span, status: str, response_headers: List):

_logger = getLogger(__name__)
# Global constants for Flask 3.1+ streaming context cleanup
_IS_FLASK_31_PLUS = hasattr(flask, "__version__") and package_version.parse(
flask.__version__
try:
_flask_version = version("flask")
except Exception:
_flask_version = None
_IS_FLASK_31_PLUS = _flask_version is not None and package_version.parse(
_flask_version
) >= package_version.parse("3.1.0")

_ENVIRON_STARTTIME_KEY = "opentelemetry-flask.starttime_key"
Expand Down
3 changes: 2 additions & 1 deletion instrumentation/opentelemetry-instrumentation-flask/tests/test_flask_compatibility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@
_request_ctx_ref,
)
from opentelemetry.test.wsgitestutil import WsgiTestBase
from opentelemetry.util._importlib_metadata import version


class TestFlaskCompatibility(WsgiTestBase):
def setUp(self):
super().setUp()
self.flask_version = flask.__version__
self.flask_version = version("flask")

def test_streaming_response_context_cleanup(self):
"""Test that streaming responses properly clean up context"""
Expand Down