Merge pull request #12 from instana/better_error_logging

Improved error capture and reporting

Author: pglombardo

README.md

@@ -46,9 +46,9 @@ To enable runtime monitoring (without request tracing), set the following enviro
 
   `export AUTOWRAPT_BOOTSTRAP=runtime`
 
-## UWSGI
+## uWSGI
 
-This Python instrumentation spawns a lightweight background thread to periodically collect and report process metrics.  By default, the GIL and threading is disabled under `uwsgi`.  If you wish to instrument your application running under UWSGI, make sure that you enable threads by passing `--enable-thread`  (or `enable-threads = true` in ini style).  More details in the [uwsgi documentation](https://uwsgi-docs.readthedocs.io/en/latest/WSGIquickstart.html#a-note-on-python-threads).
+This Python instrumentation spawns a lightweight background thread to periodically collect and report process metrics.  By default, the GIL and threading is disabled under uWSGI.  If you wish to instrument your application running under uWSGI, make sure that you enable threads by passing `--enable-thread`  (or `enable-threads = true` in ini style).  More details in the [uWSGI documentation](https://uwsgi-docs.readthedocs.io/en/latest/WSGIquickstart.html#a-note-on-python-threads).
 
 ## Usage
 

instana/django.py

@@ -31,6 +31,11 @@ def __call__(self, request):
 
         response = self.get_response(request)
 
+        if 500 <= response.status_code <= 511:
+            span.set_tag("error", True)
+            ec = span.tags.get('ec', 0)
+            span.set_tag("ec", ec+1)
+
         span.set_tag(ext.HTTP_STATUS_CODE, response.status_code)
         ot.global_tracer.inject(span.context, ot.Format.HTTP_HEADERS, response)
         span.finish()

instana/django19.py

@@ -2,6 +2,7 @@
 import opentracing as ot
 from instana import tracer, options
 import opentracing.ext.tags as ext
+import os
 
 
 DJ19_INSTANA_MIDDLEWARE = 'instana.django19.InstanaMiddleware19'
@@ -31,6 +32,11 @@ def process_request(self, request):
 
     def process_response(self, request, response):
         if self.span:
+            if 500 <= response.status_code <= 511:
+                self.span.set_tag("error", True)
+                ec = self.span.tags.get('ec', 0)
+                self.span.set_tag("ec", ec+1)
+
             self.span.set_tag(ext.HTTP_STATUS_CODE, response.status_code)
             ot.global_tracer.inject(self.span.context, ot.Format.HTTP_HEADERS, response)
             self.span.finish()
@@ -41,6 +47,12 @@ def process_response(self, request, response):
 
 def hook(module):
     """ Hook method to install the Instana middleware into Django """
+    if "INSTANA_DEV" in os.environ:
+        print("==============================================================")
+        print("Instana: Running django19 hook")
+        print("==============================================================")
+
+
     if DJ19_INSTANA_MIDDLEWARE in module.settings.MIDDLEWARE_CLASSES:
         return
 

instana/options.py

@@ -1,4 +1,5 @@
 import logging
+import os
 
 
 class Options(object):
@@ -8,4 +9,7 @@ class Options(object):
     log_level = logging.WARN
 
     def __init__(self, **kwds):
+        if "INSTANA_DEV" in os.environ:
+            self.log_level = logging.DEBUG
+
         self.__dict__.update(kwds)

instana/recorder.py

@@ -93,6 +93,8 @@ def build_registered_span(self, span):
                     ts=int(round(span.start_time * 1000)),
                     d=int(round(span.duration * 1000)),
                     f=self.sensor.agent.from_,
+                    ec=self.get_tag(span, "ec"),
+                    error=self.get_tag(span, "error"),
                     data=data)
 
     def build_sdk_span(self, span):

instana/runtime.py

@@ -11,9 +11,6 @@ def hook(module):
             print("==========================================================")
             print("Instana: Running runtime hook")
             print("==========================================================")
-            level = logging.DEBUG
-        else:
-            level = logging.WARN
 
-        opts = options.Options(log_level=level)
+        opts = options.Options()
         ot.global_tracer = tracer.InstanaTracer(opts)

instana/span.py

@@ -8,6 +8,7 @@ class InstanaSpan(object):
     n = None
     f = None
     ec = 0
+    error = False
     data = None
 
     def __init__(self, **kwds):

instana/wsgi.py

@@ -1,6 +1,6 @@
 import opentracing as ot
 from instana import tracer, options
-import opentracing.ext.tags as ext
+import opentracing.ext.tags as tags
 import logging
 
 
@@ -9,7 +9,7 @@ class iWSGIMiddleware(object):
 
     def __init__(self, app):
         self.app = app
-        opts = options.Options(log_level=logging.DEBUG)
+        opts = options.Options()
         ot.global_tracer = tracer.InstanaTracer(opts)
         self
 
@@ -20,7 +20,14 @@ def new_start_response(status, headers, exc_info=None):
             """Modified start response with additional headers."""
             ot.global_tracer.inject(span.context, ot.Format.HTTP_HEADERS, headers)
             res = start_response(status, headers, exc_info)
-            span.set_tag(ext.HTTP_STATUS_CODE, status.split(' ')[0])
+
+            sc = status.split(' ')[0]
+            if 500 <= int(sc) <= 511:
+                span.set_tag("error", True)
+                ec = span.tags.get('ec', 0)
+                span.set_tag("ec", ec+1)
+
+            span.set_tag(tags.HTTP_STATUS_CODE, sc)
             span.finish()
             return res
 
@@ -30,9 +37,9 @@ def new_start_response(status, headers, exc_info=None):
         else:
             span = ot.global_tracer.start_span("wsgi")
 
-        span.set_tag(ext.HTTP_URL, env['PATH_INFO'])
+        span.set_tag(tags.HTTP_URL, env['PATH_INFO'])
         span.set_tag("http.params", env['QUERY_STRING'])
-        span.set_tag(ext.HTTP_METHOD, env['REQUEST_METHOD'])
+        span.set_tag(tags.HTTP_METHOD, env['REQUEST_METHOD'])
         span.set_tag("http.host", env['HTTP_HOST'])
 
         return self.app(environ, new_start_response)