Sensor Clean Up: Reduce log output; Beautify

.travis.yml

@@ -1,5 +1,7 @@
 language: python
 
+dist: trusty
+
 python:
   - "2.7"
   - "3.4"

instana/agent.py

@@ -123,10 +123,10 @@ def is_agent_listening(self, host, port):
                 logger.debug("Host agent found on %s:%d" % (host, port))
                 rv = True
             else:
-                logger.debug("...something is listening on %s:%d but it's not the Instana Agent: %s"
+                logger.debug("...something is listening on %s:%d but it's not the Instana Host Agent: %s"
                              % (host, port, server_header))
         except (requests.ConnectTimeout, requests.ConnectionError):
-            logger.debug("No host agent listening on %s:%d" % (host, port))
+            logger.debug("Instana Host Agent not found on %s:%d" % (host, port))
             rv = False
         finally:
             return rv

instana/fsm.py

@@ -81,7 +81,6 @@ def reset(self):
         self.fsm.lookup()
 
     def lookup_agent_host(self, e):
-        logger.debug("lookup_agent_host")
         host, port = self.__get_agent_host_port()
 
         if self.agent.is_agent_listening(host, port):
@@ -106,7 +105,7 @@ def lookup_agent_host(self, e):
         return False
 
     def announce_sensor(self, e):
-        logger.debug("announcing sensor to the agent")
+        logger.debug("Announcing sensor to the agent")
         sock = None
         pid = os.getpid()
         cmdline = []
@@ -147,15 +146,14 @@ def announce_sensor(self, e):
         if response and (response.status_code is 200) and (len(response.content) > 2):
             self.agent.set_from(response.content)
             self.fsm.pending()
-            logger.debug("Announced pid: %s (true pid: %s) Waiting for Agent Ready" % (str(pid), str(self.agent.from_.pid)))
+            logger.debug("Announced pid: %s (true pid: %s).  Waiting for Agent Ready..." % (str(pid), str(self.agent.from_.pid)))
             return True
         else:
             logger.debug("Cannot announce sensor. Scheduling retry.")
             self.schedule_retry(self.announce_sensor, e, "announce")
         return False
 
     def schedule_retry(self, fun, e, name):
-        logger.debug("Scheduling: " + name)
         self.timer = t.Timer(self.RETRY_PERIOD, fun, [e])
         self.timer.daemon = True
         self.timer.name = name

instana/sensor.py

@@ -17,7 +17,6 @@ def __init__(self, agent, options=None):
 
         self.agent = agent
         self.meter = Meter(agent)
-        logger.debug("initialized sensor")
 
     def set_options(self, options):
         self.options = options