Merge pull request #52 from honeycombio/tredman.context-manager-return

[trace] tracer context manager should yield the span object

Author: tredman

beeline/test_trace.py

@@ -69,8 +69,8 @@ def test_trace_context_manager_starts_span_if_trace_active(self):
         tracer.start_span.return_value = mock_span
         tracer.finish_span = Mock()
 
-        with tracer('foo'):
-            pass
+        with tracer('foo') as span:
+            self.assertEqual(span, mock_span, 'tracer context manager should yield the span')
 
         tracer.start_span.assert_called_once_with(context={'name': 'foo'}, parent_id=None)
         tracer.start_trace.assert_not_called()

beeline/trace.py

@@ -51,7 +51,7 @@ def __call__(self, name, trace_id=None, parent_id=None):
                 if span:
                     log('tracer context manager started new trace, id = %s',
                         span.trace_id)
-            yield
+            yield span
         except Exception as e:
             if span:
                 span.add_context({

beeline/version.py

@@ -1 +1 @@
-VERSION = '2.4.2'
+VERSION = '2.4.3'

setup.py

@@ -4,7 +4,7 @@
 setup(
     python_requires='>=2.7',
     name='honeycomb-beeline',
-    version='2.4.2',
+    version='2.4.3',
     description='Honeycomb library for easy instrumentation',
     url='https://github.com/honeycombio/beeline-python',
     author='Honeycomb.io',