Merge pull request #342 from bmermet/pyramid-relativeimport-bug

Fix relative imports in pyramid

Author: Emanuele Palazzetti

ddtrace/contrib/pyramid/patch.py

@@ -3,6 +3,7 @@
 from .trace import trace_pyramid
 
 import pyramid.config
+from pyramid.path import caller_package
 
 import wrapt
 
@@ -20,17 +21,23 @@ def patch():
 
 
 def traced_init(wrapped, instance, args, kwargs):
-    settings = kwargs.pop("settings", {})
-    service = os.environ.get("DATADOG_SERVICE_NAME") or "pyramid"
+    settings = kwargs.pop('settings', {})
+    service = os.environ.get('DATADOG_SERVICE_NAME') or 'pyramid'
     trace_settings = {
         'datadog_trace_service' : service,
     }
     settings.update(trace_settings)
-    kwargs["settings"] = settings
+    kwargs['settings'] = settings
 
     # Commit actions immediately after they are configured so as to
     # skip conflict resolution when adding our tween
-    kwargs["autocommit"] = True
+    kwargs['autocommit'] = True
+
+    # `caller_package` works by walking a fixed amount of frames up the stack
+    # to find the calling package. So if we let the original `__init__`
+    # function call it, our wrapper will mess things up.
+    if not kwargs.get('package', None):
+        kwargs['package'] = caller_package()
 
     wrapped(*args, **kwargs)
     trace_pyramid(instance)

tests/contrib/pyramid/test_pyramid_autopatch.py

@@ -15,6 +15,15 @@
 import ddtrace
 from ddtrace import compat
 
+def _include_me(config):
+    pass
+
+def test_config_include():
+    """ This test makes sure that relative imports still work when the
+    application is run with ddtrace-run """
+    config = Configurator()
+    config.include('._include_me')
+
 
 def test_200():
     app, tracer = _get_test_app(service='foobar')