Add HTTP_STATUS_CODE to responses (and some minor code cleanup - remove redundant call to _after_request_fn) (changes largely cloned from PR #46); update tox.ini to accept pytest command line args

Author: ptmcg

flask_opentracing/tracing.py

@@ -78,14 +78,15 @@ def wrapper(*args, **kwargs):
                     return f(*args, **kwargs)
 
                 self._before_request_fn(list(attributes))
+
                 try:
                     r = f(*args, **kwargs)
-                    self._after_request_fn()
                 except Exception as e:
                     self._after_request_fn(error=e)
                     raise
 
-                self._after_request_fn()
+                self._after_request_fn(response=r)
+
                 return r
 
             wrapper.__name__ = f.__name__

tests/test_flask_tracing.py

@@ -1,7 +1,7 @@
 import mock
 import unittest
 
-from flask import (Flask, request)
+from flask import (Flask, Response, request)
 import opentracing
 from opentracing.ext import tags
 from opentracing.mocktracer import MockTracer
@@ -27,32 +27,32 @@ def flush_spans(tcr):
 
 @app.route('/test')
 def check_test_works():
-    return 'Success'
+    return Response('Success')
 
 
 @app.route('/another_test')
 @tracing.trace('url', 'url_rule')
 def decorated_fn():
-    return 'Success again'
+    return Response('Success again')
 
 
 @app.route('/another_test_simple')
 @tracing.trace('query_string', 'is_xhr')
 def decorated_fn_simple():
-    return 'Success again'
+    return Response('Success again')
 
 
 @app.route('/error_test')
 @tracing.trace()
 def decorated_fn_with_error():
-    raise RuntimeError('Should not happen')
+    raise RuntimeError('Intentional testing exception')
 
 
 @app.route('/decorated_child_span_test')
 @tracing.trace()
 def decorated_fn_with_child_span():
     with tracing.tracer.start_active_span('child'):
-        return 'Success'
+        return Response('Success')
 
 
 @app.route('/wire')
@@ -93,7 +93,7 @@ def test_span_deletion(self):
         assert not tracing_deferred._current_scopes
 
     def test_span_tags(self):
-        test_app.get('/another_test_simple')
+        response = test_app.get('/another_test_simple')
 
         spans = tracing._tracer.finished_spans()
         assert len(spans) == 1
@@ -102,6 +102,7 @@ def test_span_tags(self):
             tags.HTTP_METHOD: 'GET',
             tags.SPAN_KIND: tags.SPAN_KIND_RPC_SERVER,
             tags.HTTP_URL: 'http://localhost/another_test_simple',
+            tags.HTTP_STATUS_CODE: response.status_code,
         }
 
     @flaky(max_runs=5)

tox.ini

@@ -23,4 +23,4 @@ deps =
     flaky
 extras = tests
 commands =
-    pytest
+    pytest {posargs}