Merged
Conversation
adamchainz
force-pushed
the
issue_34_celery_queue_name
branch
3 times, most recently
from
bc9bc03 to
fedd677
Compare
adamchainz
added a commit
that referenced
this pull request
Jul 2, 2019
Fixes #35. Track the queue time by using an extra haeder to track when the task is added to the queue and comparing when it gets executed. This should work in most setups but if the celery app isn't all set up on the producer side, we are well defended against it. Like #205, I manually tested on Celery 3.1.x locally by editing `tox.ini` and reinstalling with `tox -r`.
adamchainz
added a commit
that referenced
this pull request
Jul 2, 2019
Fixes #35. Track the queue time by using an extra haeder to track when the task is added to the queue and comparing when it gets executed. This should work in most setups but if the celery app isn't all set up on the producer side, we are well defended against it. Like #205, I manually tested on Celery 3.1.x locally by editing `tox.ini` and reinstalling with `tox -r`.
adamchainz
added a commit
that referenced
this pull request
Jul 3, 2019
Fixes #35. Track the queue time by using an extra haeder to track when the task is added to the queue and comparing when it gets executed. This should work in most setups but if the celery app isn't all set up on the producer side, we are well defended against it. Like #205, I manually tested on Celery 3.1.x locally by editing `tox.ini` and reinstalling with `tox -r`.
dlanderson
reviewed
Jul 3, 2019
Contributor
dlanderson
left a comment
dlanderson
left a comment
There was a problem hiding this comment.
A few questions around changing method signatures and tags
src/scout_apm/celery.py
Outdated
| span.tag("is_eager", delivery_info.get("is_eager", False)) | ||
| span.tag("exchange", delivery_info.get("exchange", "unknown")) | ||
| span.tag("routing_key", delivery_info.get("routing_key", "unknown")) | ||
| span.tag("queue", delivery_info.get("queue", "unknown")) |
Contributor
There was a problem hiding this comment.
I think the core agent knows how to handle the queue tag, but the others are not supported explicitly and will be silently dropped, IIRC. Are we wanting to track this info in span tags or in context? @cschneid might chime in here.
Contributor
Author
There was a problem hiding this comment.
Aha, I didn't know that span tags are dropped. Moving to request tags/context is probably the right move in that case, but I'll wait for @cschneid 's input.
Contributor
There was a problem hiding this comment.
Currently in the core agent, span tags are very specific, and unknown ones are dropped. Some upcoming work will be to support the new trace structure, where arbitrary span tags are sent onward, but that's not for a bit. queue is recognized as the string queue name that the job was enqueued on & then popped off of.
For now it's probably ok to add these as request tags (context). But anyway, this does feel like it's scoped to the whole request (the job), not just the section of code that celery is calling first..
Contributor
Author
There was a problem hiding this comment.
Moving them all to request tags then. I think I had a concern that celery might recursively execute tasks with its fancy chord structures, but after checking the docs again I don't think that's the case
adamchainz
force-pushed
the
issue_34_celery_queue_name
branch
from
fedd677 to
91380a1
Compare
Fixes #34. Tagging with the current *queue* is only *sometimes* possible - often the *exchange* and *routing_key* are provided instead. The task may have come from a particular queue, but its delivery information normally onyl tracks where it was sent at the top of the AMQP funnel by exchange + routing_key, since that's what's needed for retry. Also track the `is_eager` flag which may be useful for determining which way the task was run. More information on these parameters can be gleaned from [the source](https://github.com/celery/celery/blob/8cf8fae70630954cff3448485588bbe2a77ff3ab/celery/app/task.py#L600). Updating the tests to use the fixture added in Celery 4.0, but since we support 3.1 this is in a conditional test. Our test suite currently installs the latest version of Celery only, so I tested locally temporarily with Celery 3.1 as well by specifying `celery>=3.1,<3.2` in `tox.ini`. For complete automated testing in the future, we should look at a better requirements management system.
adamchainz
force-pushed
the
issue_34_celery_queue_name
branch
from
91380a1 to
0881794
Compare
adamchainz
added a commit
that referenced
this pull request
Aug 10, 2019
Fixes #35. Track the queue time by using an extra haeder to track when the task is added to the queue and comparing when it gets executed. This should work in most setups but if the celery app isn't all set up on the producer side, we are well defended against it. Like #205, I manually tested on Celery 3.1.x locally by editing `tox.ini` and reinstalling with `tox -r`.
adamchainz
added a commit
that referenced
this pull request
Aug 10, 2019
Fixes #35. Track the queue time by using an extra haeder to track when the task is added to the queue and comparing when it gets executed. This should work in most setups but if the celery app isn't all set up on the producer side, we are well defended against it. Like #205, I manually tested on Celery 3.1.x locally by editing `tox.ini` and reinstalling with `tox -r`.
adamchainz
added a commit
that referenced
this pull request
Aug 10, 2019
Fixes #35. Track the queue time by using an extra haeder to track when the task is added to the queue and comparing when it gets executed. This should work in most setups but if the celery app isn't all set up on the producer side, we are well defended against it. Like #205, I manually tested on Celery 3.1.x locally by editing `tox.ini` and reinstalling with `tox -r`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #34. Tagging with the current queue is only sometimes possible - often the exchange and routing_key are provided instead. The task may have come from a particular queue, but its delivery information normally onyl tracks where it was sent at the top of the AMQP funnel by exchange + routing_key, since that's what's needed for retry. Also track the
is_eagerflag which may be useful for determining which way the task was run.More information on these parameters can be gleaned from the source.
Updating the tests to use the fixture added in Celery 4.0, but since we support 3.1 this is in a conditional test. Our test suite currently installs the latest version of Celery only, so I tested locally temporarily with Celery 3.1 as well by specifying
celery>=3.1,<3.2intox.ini. For complete automated testing in the future, we should look at a better requirements management system.