Merge remote-tracking branch 'upstream/master' into majorgreys/instru…

…mentor-celery
open-telemetry · Jun 16, 2020 · 3eae958 · 3eae958
2 parents 440c66d + 521115f
commit 3eae958
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/eachdist.ini b/eachdist.ini
@@ -9,6 +9,7 @@ sortfirst=
  tests/util
  ext/opentelemetry-ext-wsgi
  ext/opentelemetry-ext-dbapi
+ ext/opentelemetry-ext-asgi
  ext/*
 
 [lintroots]

diff --git a/ext/opentelemetry-ext-celery/README.rst b/ext/opentelemetry-ext-celery/README.rst
@@ -29,7 +29,6 @@ Usage
 
 .. code-block:: python
 
- from opentelemetry import trace
  from opentelemetry.ext.celery import CeleryInstrumentor
 
  CeleryInstrumentor().instrument()

diff --git a/ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/__init__.py b/ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/__init__.py
@@ -30,7 +30,6 @@
 
 .. code:: python
 
- from opentelemetry import trace
  from opentelemetry.ext.celery import CeleryInstrumentor
 
  CeleryInstrumentor().instrument()
@@ -141,9 +140,6 @@ def _trace_postrun(*args, **kwargs):
  utils.detach_span(task, task_id)
 
  def _trace_before_publish(self, *args, **kwargs):
- # The `Task` instance **does not** include any information about the current
- # execution, so it **must not** be used to retrieve `request` data.
- # pylint: disable=no-member
  task = utils.retrieve_task_from_sender(kwargs)
  task_id = utils.retrieve_task_id_from_message(kwargs)