Skip to content

Commit 3eae958

Browse files
committed
Merge remote-tracking branch 'upstream/master' into majorgreys/instrumentor-celery
2 parents 440c66d + 521115f commit 3eae958

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

Diff for: eachdist.ini

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ sortfirst=
99
tests/util
1010
ext/opentelemetry-ext-wsgi
1111
ext/opentelemetry-ext-dbapi
12+
ext/opentelemetry-ext-asgi
1213
ext/*
1314

1415
[lintroots]

Diff for: ext/opentelemetry-ext-celery/README.rst

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Usage
2929

3030
.. code-block:: python
3131
32-
from opentelemetry import trace
3332
from opentelemetry.ext.celery import CeleryInstrumentor
3433
3534
CeleryInstrumentor().instrument()

Diff for: ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/__init__.py

-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
3131
.. code:: python
3232
33-
from opentelemetry import trace
3433
from opentelemetry.ext.celery import CeleryInstrumentor
3534
3635
CeleryInstrumentor().instrument()
@@ -141,9 +140,6 @@ def _trace_postrun(*args, **kwargs):
141140
utils.detach_span(task, task_id)
142141

143142
def _trace_before_publish(self, *args, **kwargs):
144-
# The `Task` instance **does not** include any information about the current
145-
# execution, so it **must not** be used to retrieve `request` data.
146-
# pylint: disable=no-member
147143
task = utils.retrieve_task_from_sender(kwargs)
148144
task_id = utils.retrieve_task_id_from_message(kwargs)
149145

0 commit comments

Comments
 (0)