Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion elasticapm/contrib/flask/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ def init_app(self, app, **defaults) -> None:

if "framework_name" not in defaults:
defaults["framework_name"] = "flask"
defaults["framework_version"] = getattr(flask, "__version__", "<0.7")
try:
flask_version = __import__("importlib.metadata").metadata.version("flask")
except ImportError:
flask_version = getattr(flask, "__version__", "<0.7")
defaults["framework_version"] = flask_version

self.client = self.client_cls(config, **defaults)

Expand Down
1 change: 1 addition & 0 deletions tests/contrib/flask/flask_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ def test_framework_name(flask_app):
assert apm.client.config.framework_name == "flask"
app_info = apm.client.get_service_info()
assert app_info["framework"]["name"] == "flask"
assert app_info["framework"]["version"]
apm.client.close()

# Cleanup -- we don't use the flask_apm_client fixture here because it uses
Expand Down
Loading