Switch to psutil and update announce

Author: pglombardo

instana/fsm.py

@@ -1,6 +1,6 @@
 import subprocess
 import os
-import sys
+import psutil
 import threading as t
 import fysom as f
 import instana.log as l
@@ -91,10 +91,10 @@ def check_host(self, host):
 
     def announce_sensor(self, e):
         l.debug("announcing sensor to the agent")
-
-        d = Discovery(pid=os.getpid(),
-                      name=sys.executable,
-                      args=sys.argv[0:])
+        p = psutil.Process(os.getpid())
+        d = Discovery(pid=p.pid,
+                      name=p.cmdline()[0],
+                      args=p.cmdline()[1:])
 
         (b, _) = self.agent.request_response(
             self.agent.make_url(a.AGENT_DISCOVERY_URL), "PUT", d)

requirements.txt

@@ -2,3 +2,4 @@ nose>=1.0
 fysom>=2.1.2
 opentracing>=1.2.1
 basictracer>=2.2.0
+psutil>=5.1.3

setup.py

@@ -13,5 +13,6 @@
       setup_requires=['nose>=1.0',
                       'fysom>=2.1.2',
                       'opentracing>=1.2.1,<1.3',
-                      'basictracer>=2.2.0'],
+                      'basictracer>=2.2.0',
+                      'psutil>=5.1.3'],
       test_suite='nose.collector')