Merge branch 'master' into autoinstrumentation-hooks

Author: pglombardo

instana/__init__.py

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

instana/agent.py

@@ -3,6 +3,7 @@
 import instana.fsm as f
 import instana.agent_const as a
 import threading
+from datetime import datetime
 
 try:
     import urllib.request as urllib2
@@ -35,14 +36,14 @@ class Agent(object):
     host = a.AGENT_DEFAULT_HOST
     port = a.AGENT_DEFAULT_PORT
     fsm = None
-    from_ = None
+    from_ = From()
+    last_seen = None
 
     def __init__(self, sensor):
         log.debug("initializing agent")
 
         self.sensor = sensor
         self.fsm = f.Fsm(self)
-        self.reset()
 
     def to_json(self, o):
         try:
@@ -51,6 +52,13 @@ def to_json(self, o):
         except Exception as e:
             log.info("to_json: ", e, o)
 
+    def is_timed_out(self):
+        if self.last_seen and self.can_send:
+            diff = datetime.now() - self.last_seen
+            if diff.seconds > 60:
+                return True
+        return False
+
     def can_send(self):
         return self.fsm.fsm.current == "good2go"
 
@@ -91,6 +99,7 @@ def full_request_response(self, url, method, o, body, header):
                     if self.can_send():
                         self.reset()
                 else:
+                    self.last_seen = datetime.now()
                     if body:
                         b = response.read()
 
@@ -126,6 +135,7 @@ def make_full_url(self, host, port, prefix):
         return s
 
     def reset(self):
+        self.last_seen = None
         self.from_ = From()
         self.fsm.reset()
 

instana/fsm.py

@@ -1,7 +1,7 @@
-import subprocess
-import os
 import sys
+import os
 import socket
+import subprocess
 import threading as t
 import fysom as f
 from instana import log
@@ -41,24 +41,31 @@ def __init__(self, agent):
 
         self.agent = agent
         self.fsm = f.Fysom({
-            "initial": "lostandalone",
             "events": [
-                ("startup",  "*",            "lostandalone"),
-                ("lookup",   "lostandalone", "found"),
+                ("lookup",   "*",            "found"),
                 ("announce", "found",        "announced"),
                 ("ready",    "announced",    "good2go")],
             "callbacks": {
                 "onlookup":       self.lookup_agent_host,
                 "onannounce":     self.announce_sensor,
+                "onready":        self.start_metric_reporting,
                 "onchangestate":  self.printstatechange}})
 
+        timer = t.Timer(2, self.fsm.lookup)
+        timer.daemon = True
+        timer.name = "Startup"
+        timer.start()
+
     def printstatechange(self, e):
         log.debug('========= (%i#%s) FSM event: %s, src: %s, dst: %s ==========' %
                   (os.getpid(), t.current_thread().name, e.event, e.src, e.dst))
 
     def reset(self):
         self.fsm.lookup()
 
+    def start_metric_reporting(self, e):
+        self.agent.sensor.meter.run()
+
     def lookup_agent_host(self, e):
         if self.agent.sensor.options.agent_host != "":
             host = self.agent.sensor.options.agent_host
@@ -110,6 +117,7 @@ def announce_sensor(self, e):
         log.debug("announcing sensor to the agent")
         s = None
         pid = os.getpid()
+        cmdline = []
 
         if os.path.isfile("/proc/self/cmdline"):
             with open("/proc/self/cmdline") as cmd:

instana/meter.py

@@ -114,7 +114,6 @@ class Meter(object):
 
     def __init__(self, sensor):
         self.sensor = sensor
-        self.run()
 
     def run(self):
         self.timer = t.Thread(target=self.collect_and_report)
@@ -125,6 +124,10 @@ def run(self):
     def collect_and_report(self):
         while 1:
             self.process()
+            if (self.sensor.agent.is_timed_out()):
+                log.warn("Host agent offline for >1 min.  Going to sit in a corner...")
+                self.sensor.agent.reset()
+                break
             time.sleep(1)
 
     def process(self):

setup.py

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