Skip to content
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.

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

Check for missing elasticapm_client in tornado instrumentation #813

Merged
merged 3 commits into from
May 4, 2020

Conversation

basepi
Copy link
Contributor

@basepi basepi commented Apr 29, 2020

What does this pull request do?

If tornado is in use but not as the "main" instrumented framework (such as with flower), the instrumentation throws an error because the elasticapm_client cannot be found.

This PR checks for that case and skips all of the instrumentation work.

Related issues

Closes #811

@basepi
Copy link
Contributor Author

basepi commented Apr 29, 2020

Going to try to figure out how to write a test for this tomorrow.

@apmmachine
Copy link
Contributor

apmmachine commented Apr 29, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview stats

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 9195
Skipped 6667
Total 15862

@beniwohli
Copy link
Contributor

Great catch! Something to keep in mind for any new framework integrations that use instrumentation in the future

@basepi basepi marked this pull request as ready for review April 30, 2020 18:39
@basepi basepi requested a review from beniwohli April 30, 2020 18:39
Copy link
Contributor

@beniwohli beniwohli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@basepi basepi merged commit e27e8a4 into elastic:master May 4, 2020
romulorosa pushed a commit to romulorosa/apm-agent-python that referenced this pull request Oct 15, 2020
…ic#813)

* Check for missing elasticapm_client in tornado instrumentation

* Add a test
romulorosa pushed a commit to romulorosa/apm-agent-python that referenced this pull request Oct 15, 2020
…ic#813)

* Check for missing elasticapm_client in tornado instrumentation

* Add a test
beniwohli pushed a commit to beniwohli/apm-agent-python that referenced this pull request Sep 14, 2021
…ic#813)

* Check for missing elasticapm_client in tornado instrumentation

* Add a test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flower hangs from version 5.4.0.
3 participants