Merge pull request #11 from instana/better_faster_stronger_flask

Better, faster, stronger Flask initialization

instana/django.py

@@ -2,6 +2,7 @@
 import opentracing as ot
 from instana import tracer, options
 import opentracing.ext.tags as ext
+import os
 
 
 DJ_INSTANA_MIDDLEWARE = 'instana.django.InstanaMiddleware'
@@ -38,6 +39,11 @@ def __call__(self, request):
 
 def hook(module):
     """ Hook method to install the Instana middleware into Django """
+    if "INSTANA_DEV" in os.environ:
+        print("==============================================================")
+        print("Instana: Running django hook")
+        print("==============================================================")
+
     if DJ_INSTANA_MIDDLEWARE in module.settings.MIDDLEWARE:
         return
 

instana/flaskana.py

@@ -1,15 +1,19 @@
+from __future__ import print_function
 from instana import wsgi
-from flask.cli import ScriptInfo
+import wrapt
+import os
 
 
-def wrap_load_app(func):
-    def wrapper(self, *args):
-        app = func(self, *args)
-        app.wsgi_app = wsgi.iWSGIMiddleware(app.wsgi_app)
-        return app
-    return wrapper
+def wrapper(wrapped, instance, args, kwargs):
+    rv = wrapped(*args, **kwargs)
+    instance.wsgi_app = wsgi.iWSGIMiddleware(instance.wsgi_app)
+    return rv
 
 
 def hook(module):
     """ Hook method to install the Instana middleware into Flask """
-    ScriptInfo.load_app = wrap_load_app(ScriptInfo.load_app)
+    if "INSTANA_DEV" in os.environ:
+        print("==============================================================")
+        print("Instana: Running flask hook")
+        print("==============================================================")
+    wrapt.wrap_function_wrapper('flask', 'Flask.__init__', wrapper)

instana/meter.py

@@ -106,7 +106,7 @@ def to_dict(self):
 
 class Meter(object):
     SNAPSHOT_PERIOD = 600
-    snapshot_countdown = 25
+    snapshot_countdown = 35
     sensor = None
     last_usage = None
     last_collect = None

instana/runtime.py

@@ -8,8 +8,12 @@ def hook(module):
     """ Hook method to install the Instana middleware into Flask """
     if os.environ["AUTOWRAPT_BOOTSTRAP"] == "runtime":
         if "INSTANA_DEV" in os.environ:
+            print("==========================================================")
+            print("Instana: Running runtime hook")
+            print("==========================================================")
             level = logging.DEBUG
         else:
             level = logging.WARN
+
         opts = options.Options(log_level=level)
         ot.global_tracer = tracer.InstanaTracer(opts)

instana/span.py

@@ -1,6 +1,3 @@
-HTTP_CLIENT = "g.hc"
-HTTP_SERVER = "g.http"
-
 class InstanaSpan(object):
     t = 0
     p = None

instana/util.py

@@ -32,7 +32,7 @@ def id_to_header(id):
         return ""
 
     byteString = struct.pack('>q', id)
-    return binascii.hexlify(byteString).decode('UTF-8').lstrip('0')
+    return str(binascii.hexlify(byteString).decode('UTF-8').lstrip('0'))
 
 
 def header_to_id(header):

instana/wsgi.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import opentracing as ot
 from instana import tracer, options
 import opentracing.ext.tags as ext

setup.py

@@ -19,7 +19,7 @@
                         'psutil>=5.1.3'],
       entry_points={'django': ['django.core.handlers.base = instana.django:hook'],
                     'django19': ['django.core.handlers.base = instana.django19:hook'],
-                    'flask': ['flask.cli = instana.flaskana:hook'],
+                    'flask': ['flask = instana.flaskana:hook'],
                     'runtime': ['string = instana.runtime:hook']},
       test_suite='nose.collector',
       keywords=['performance', 'opentracing', 'metrics', 'monitoring'],