Merge pull request #469 from DataDog/alex.charrier/ddtracerun-celery

[celery] fixing ddtrace-run broke celery support

Author: Emanuele Palazzetti

ddtrace/bootstrap/sitecustomize.py

@@ -70,6 +70,9 @@ def update_patched_modules():
     if opts:
         tracer.configure(**opts)
 
+    if not hasattr(sys, 'argv'):
+        sys.argv = ['']
+
     if patch:
         update_patched_modules()
         from ddtrace import patch_all; patch_all(**EXTRA_PATCHED_MODULES) # noqa

tests/commands/ddtrace_run_argv.py

@@ -0,0 +1,10 @@
+from __future__ import print_function
+
+from ddtrace import tracer
+
+from nose.tools import eq_
+import sys
+
+if __name__ == '__main__':
+    eq_(sys.argv[1:], ['foo', 'bar'])
+    print("Test success")

tests/commands/ddtrace_run_patched_modules.py

@@ -6,4 +6,5 @@
 
 if __name__ == '__main__':
     ok_('redis' in monkey.get_patched_modules())
+    ok_('celery' in monkey.get_patched_modules())
     print("Test success")

tests/commands/test_runner.py

@@ -169,3 +169,9 @@ def test_sitecustomize_run_suppressed(self):
             env=env,
         )
         assert out.startswith(b"Test success")
+
+    def test_argv_passed(self):
+        out = subprocess.check_output(
+            ['ddtrace-run', 'python', 'tests/commands/ddtrace_run_argv.py', 'foo', 'bar']
+        )
+        assert out.startswith(b"Test success")

tox.ini

@@ -131,6 +131,7 @@ deps =
     # TODO[manu] update to a stable version of Celery
     celery42: celery==4.2.0rc3
     ddtracerun: redis
+    ddtracerun: celery
     elasticsearch16: elasticsearch>=1.6,<1.7
     elasticsearch17: elasticsearch>=1.7,<1.8
     elasticsearch18: elasticsearch>=1.8,<1.9