Add support for INSTANA_DEBUG env var; remove INSTANA_DEV (#154)

Author: pglombardo

Configuration.md

@@ -43,11 +43,11 @@ config['asyncio_task_context_propagation']['enabled'] = True
 
 ## Debugging & More Verbosity
 
-Setting `INSTANA_DEV` to a non nil value will enable extra logging output generally useful
+Setting `INSTANA_DEBUG` to a non nil value will enable extra logging output generally useful
 for development.
 
 ```Python
-export INSTANA_DEV="true"
+export INSTANA_DEBUG="true"
 ```
 
 ## Disabling Automatic instrumentation

example/Dockerfile

@@ -5,6 +5,6 @@ WORKDIR /usr/src/app
 COPY . ./
 RUN pip install --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app
-ENV INSTANA_DEV true
+ENV INSTANA_DEBUG true
 
 CMD [ "python", "./example/simple.py" ]

instana/__init__.py

@@ -46,7 +46,7 @@ def load(_):
     Method used to activate the Instana sensor via AUTOWRAPT_BOOTSTRAP
     environment variable.
     """
-    if "INSTANA_DEV" in os.environ:
+    if "INSTANA_DEBUG" in os.environ:
         print("==========================================================")
         print("Instana: Loading...")
         print("==========================================================")

instana/flaskana.py

@@ -15,7 +15,7 @@ def wrapper(wrapped, instance, args, kwargs):
 
 def hook(module):
     """ Hook method to install the Instana middleware into Flask """
-    if "INSTANA_DEV" in os.environ:
+    if "INSTANA_DEBUG" in os.environ:
         print("==============================================================")
         print("Instana: Running flask hook")
         print("==============================================================")

instana/log.py

@@ -9,7 +9,7 @@ def init(level):
     f = log.Formatter('%(asctime)s: %(process)d %(levelname)s %(name)s: %(message)s')
     ch.setFormatter(f)
     logger.addHandler(ch)
-    if "INSTANA_DEV" in os.environ:
+    if "INSTANA_DEBUG" in os.environ:
         logger.setLevel(log.DEBUG)
     else:
         logger.setLevel(level)

instana/options.py

@@ -13,7 +13,7 @@ def __init__(self, **kwds):
         """ Initialize Options
         Respect any environment variables that may be set.
         """
-        if "INSTANA_DEV" in os.environ:
+        if "INSTANA_DEBUG" in os.environ:
             self.log_level = logging.DEBUG
 
         if "INSTANA_SERVICE_NAME" in os.environ:

instana/tracer.py

@@ -129,7 +129,7 @@ def __add_stack(self, span, limit=None):
                 break
 
             # Exclude Instana frames unless we're in dev mode
-            if "INSTANA_DEV" not in os.environ:
+            if "INSTANA_DEBUG" not in os.environ:
                 if re_tracer_frame.search(frame[0]) is not None:
                     continue