Standardize on INSTANA_AGENT_HOST; Deprecate *_IP

Author: pglombardo

Configuration.md

@@ -7,7 +7,7 @@ The sensor tries to communicate with the Instana agent via IP 127.0.0.1 and as a
 To use these, these environment variables should be set in the environment of the running Python process.
 
 ```shell
-export INSTANA_AGENT_IP = '127.0.0.1'
+export INSTANA_AGENT_HOST = '127.0.0.1'
 export INSTANA_AGENT_PORT = '42699'
 ```
 

instana/fsm.py

@@ -70,7 +70,14 @@ def lookup_agent_host(self, e):
         host = a.AGENT_DEFAULT_HOST
         port = a.AGENT_DEFAULT_PORT
 
-        if "INSTANA_AGENT_IP" in os.environ:
+        if "INSTANA_AGENT_HOST" in os.environ:
+            host = os.environ["INSTANA_AGENT_HOST"]
+            if "INSTANA_AGENT_PORT" in os.environ:
+                port = int(os.environ["INSTANA_AGENT_PORT"])
+
+        elif "INSTANA_AGENT_IP" in os.environ:
+            # Deprecated: INSTANA_AGENT_IP environment variable
+            # To be removed in a future version
             host = os.environ["INSTANA_AGENT_IP"]
             if "INSTANA_AGENT_PORT" in os.environ:
                 port = int(os.environ["INSTANA_AGENT_PORT"])

instana/options.py

@@ -16,8 +16,13 @@ def __init__(self, **kwds):
             self.log_level = logging.DEBUG
 
         if "INSTANA_AGENT_IP" in os.environ:
+            # Deprecated: INSTANA_AGENT_IP environment variable
+            # To be removed in a future version
             self.agent_host = os.environ["INSTANA_AGENT_IP"]
 
+        if "INSTANA_AGENT_HOST" in os.environ:
+            self.agent_host = os.environ["INSTANA_AGENT_HOST"]
+
         if "INSTANA_AGENT_PORT" in os.environ:
             self.agent_port = os.environ["INSTANA_AGENT_PORT"]