wip

Author: owais

README.rst

@@ -25,7 +25,7 @@ In order to implement tracing in your system (for all the requests), add the fol
 
 .. code-block:: python
 
-    from opentracing.scope_managers.tornado import TornadoScopeManager
+    from opentracing_tornado.scope_managers import TornadoScopeManager
     import tornado_opentracing
 
     # Create your opentracing tracer using TornadoScopeManager for active Span handling.

tests/helpers/__init__.py

@@ -2,7 +2,7 @@
 
 import tornado_opentracing
 from opentracing.mocktracer import MockTracer
-from tornado_opentracing.scope_manager import ScopeManager
+from tornado_opentracing.scope_managers import ScopeManager
 
 
 if sys.version_info >= (3, 3):

tests/helpers/handlers.py

@@ -9,7 +9,7 @@ def get(self):
 
 
 if sys.version_info > (3, 5):
-    from ._handlers_async import (
+    from .handlers_async_await import (
         AsyncScopeHandler,
         DecoratedAsyncHandler,
         DecoratedAsyncScopeHandler,

tests/test_client.py

@@ -20,8 +20,8 @@
 import tornado.web
 import tornado.testing
 import tornado_opentracing
-from tornado_opentracing.scope_manager import ScopeManager
-from tornado_opentracing.context_manager import tornado_context
+from tornado_opentracing.scope_managers import ScopeManager
+from tornado_opentracing.context_managers import tornado_context
 
 from .helpers import AsyncHTTPTestCase
 

tests/test_decorated.py

@@ -16,7 +16,7 @@
 import tornado.web
 import tornado.testing
 import tornado_opentracing
-from tornado_opentracing.context_manager import tornado_context
+from tornado_opentracing.context_managers import tornado_context
 
 from .helpers import tracing
 from .helpers import AsyncHTTPTestCase

tests/test_tracing.py

@@ -24,8 +24,8 @@
 import tornado_opentracing
 from tornado import version_info as tornado_version
 from tornado_opentracing import TornadoTracing
-from tornado_opentracing.scope_manager import ScopeManager
-from tornado_opentracing.context_manager import tornado_context
+from tornado_opentracing.scope_managers import ScopeManager
+from tornado_opentracing.context_managers import tornado_context
 
 from .helpers import AsyncHTTPTestCase
 from .helpers.handlers import AsyncScopeHandler

tornado_opentracing/context_manager.py renamed to tornado_opentracing/context_managers.py

@@ -47,7 +47,9 @@ def _patch_handler_init(init, handler, args, kwargs):
     init(*args, **kwargs)
 
     tracing = handler.settings.get('opentracing_tracing')
-    if tracing and not tracing._trace_all:
+    if not tracing:
+        return
+    if not tracing._trace_all:
         return
 
     for method in handler.SUPPORTED_METHODS: