Skip to content

label no longer fails when called without a client #1596

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

Merged
merged 1 commit into from
Jul 25, 2022
Merged

label no longer fails when called without a client #1596

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion elasticapm/traces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,8 @@ def label(**labels):
"""
transaction = execution_context.get_transaction()
if not transaction:
if elasticapm.get_client().config.enabled:
client = elasticapm.get_client()
if not client or client.config.enabled:
error_logger.warning("Ignored labels %s. No transaction currently active.", ", ".join(labels.keys()))
else:
transaction.label(**labels)
Expand Down
4 changes: 4 additions & 0 deletions tests/client/client_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,3 +536,7 @@ def test_check_server_version(elasticapm_client):
)
def test_user_agent(elasticapm_client, expected):
assert elasticapm_client.get_user_agent() == "apm-agent-python/unknown (myapp{})".format(expected)


def test_label_without_client():
elasticapm.label(foo="foo")