Merge branch 'master' into better-django

Author: pglombardo

instana/__init__.py

@@ -24,7 +24,7 @@
 __copyright__ = 'Copyright 2017 Instana Inc.'
 __credits__ = ['Pavlo Baron', 'Peter Giacomo Lombardo']
 __license__ = 'MIT'
-__version__ = '0.7.4'
+__version__ = '0.7.5'
 __maintainer__ = 'Peter Giacomo Lombardo'
 __email__ = '[email protected]'
 

instana/fsm.py

@@ -1,5 +1,5 @@
-import sys
 import os
+import sys
 import socket
 import subprocess
 import threading as t
@@ -129,13 +129,24 @@ def announce_sensor(self, e):
         pid = os.getpid()
         cmdline = []
 
-        if os.path.isfile("/proc/self/cmdline"):
-            with open("/proc/self/cmdline") as cmd:
-                cmdinfo = cmd.read()
-            cmdline = cmdinfo.split('\x00')
-        else:
-            cmdline = [sys.executable]
-            cmdline += sys.argv
+        try:
+            if os.path.isfile("/proc/self/cmdline"):
+                with open("/proc/self/cmdline") as cmd:
+                    cmdinfo = cmd.read()
+                cmdline = cmdinfo.split('\x00')
+            else:
+                # Python doesn't provide a reliable method to determine what
+                # the OS process command line may be.  Here we are forced to
+                # rely on ps rather than adding a dependency on something like
+                # psutil which requires dev packages, gcc etc...
+                proc = subprocess.Popen(["ps", "-p", str(pid), "-o", "command"],
+                                        stdout=subprocess.PIPE)
+                (out, err) = proc.communicate()
+                parts = out.split(b'\n')
+                cmdline = [parts[1].decode("utf-8")]
+        except Exception as err:
+            cmdline = sys.argv
+            log.debug(err)
 
         d = Discovery(pid=pid,
                       name=cmdline[0],

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='instana',
-      version='0.7.4',
+      version='0.7.5',
       download_url='https://github.com/instana/python-sensor',
       url='https://www.instana.com/',
       license='MIT',