Merge pull request #384 from joual/pyramid-render-missing-req

Keep request as part of pyramid render kwargs

Author: Emanuele Palazzetti

ddtrace/contrib/pyramid/trace.py

@@ -28,7 +28,7 @@ def includeme(config):
 
 def trace_render(func, instance, args, kwargs):
     # If the request is not traced, we do not trace
-    request = kwargs.pop('request', {})
+    request = kwargs.get('request', {})
     if not request:
         log.debug("No request passed to render, will not be traced")
         return func(*args, **kwargs)

tests/contrib/pyramid/test_pyramid.py

@@ -7,6 +7,7 @@
 # 3p
 from pyramid.response import Response
 from pyramid.config import Configurator
+from pyramid.renderers import render_to_response
 from pyramid.httpexceptions import HTTPInternalServerError
 import webtest
 from nose.tools import eq_
@@ -118,6 +119,29 @@ def test_json(self):
         eq_(s.error, 0)
         eq_(s.span_type, 'template')
 
+    def test_renderer(self):
+        res = self.app.get('/renderer', status=200)
+        assert self.rend._received['request'] is not None
+        self.rend.assert_(foo='bar')
+        writer = self.tracer.writer
+        spans = writer.pop()
+        eq_(len(spans), 2)
+        spans_by_name = {s.name: s for s in spans}
+        s = spans_by_name['pyramid.request']
+        eq_(s.service, 'foobar')
+        eq_(s.resource, 'GET renderer')
+        eq_(s.error, 0)
+        eq_(s.span_type, 'http')
+        eq_(s.meta.get('http.method'), 'GET')
+        eq_(s.meta.get('http.status_code'), '200')
+        eq_(s.meta.get('http.url'), '/renderer')
+        eq_(s.meta.get('pyramid.route.name'), 'renderer')
+
+        s = spans_by_name['pyramid.render']
+        eq_(s.service, 'foobar')
+        eq_(s.error, 0)
+        eq_(s.span_type, 'template')
+
 class TestPyramid(PyramidBase):
     def setUp(self):
         from tests.test_tracer import get_dummy_tracer
@@ -128,6 +152,7 @@ def setUp(self):
             'datadog_tracer': self.tracer
         }
         config = Configurator(settings=settings)
+        self.rend = config.testing_add_renderer('template.pt')
         trace_pyramid(config)
 
         app = get_app(config)
@@ -213,14 +238,19 @@ def exception(request):
     def json(request):
         return {'a': 1}
 
+    def renderer(request):
+        return render_to_response('template.pt', {'foo': 'bar'}, request=request)
+
     config.add_route('index', '/')
     config.add_route('error', '/error')
     config.add_route('exception', '/exception')
     config.add_route('json', '/json')
+    config.add_route('renderer', '/renderer')
     config.add_view(index, route_name='index')
     config.add_view(error, route_name='error')
     config.add_view(exception, route_name='exception')
     config.add_view(json, route_name='json', renderer='json')
+    config.add_view(renderer, route_name='renderer', renderer='template.pt')
     return config.make_wsgi_app()
 
 

tests/contrib/pyramid/test_pyramid_autopatch.py

@@ -19,7 +19,7 @@ def setUp(self):
         ddtrace.tracer = self.tracer
 
         config = Configurator()
-
+        self.rend = config.testing_add_renderer('template.pt')
         app = get_app(config)
         self.app = webtest.TestApp(app)
 
@@ -30,7 +30,7 @@ def setUp(self):
         ddtrace.tracer = self.tracer
 
         config = Configurator(settings={'pyramid.tweens': 'pyramid.tweens.excview_tween_factory\n'})
-
+        self.rend = config.testing_add_renderer('template.pt')
         app = get_app(config)
         self.app = webtest.TestApp(app)