Snapshot reporting: Better version extraction (instana#94)

* Better version extraction

Don't include builtin modules

* Better exception message; linter fixes

Author: pglombardo

instana/instrumentation/django/middleware.py

@@ -39,8 +39,8 @@ def process_request(self, request):
                 self.scope.span.set_tag("http.params", env['QUERY_STRING'])
             if 'HTTP_HOST' in env:
                 self.scope.span.set_tag("http.host", env['HTTP_HOST'])
-        except Exception as e:
-            logger.debug("Instana middleware @ process_response: ", e)
+        except Exception:
+            logger.debug("Django middleware @ process_response", exc_info=True)
 
     def process_response(self, request, response):
         try:

instana/meter.py

@@ -8,7 +8,7 @@
 import time
 from types import ModuleType
 
-import instana
+from pkg_resources import get_distribution, DistributionNotFound
 
 from .agent_const import AGENT_DATA_URL
 from .log import logger as log
@@ -188,29 +188,31 @@ def jsonable(self, value):
 
     def collect_modules(self):
         try:
-            r = {}
+            res = {}
             m = sys.modules
             for k in m:
                 # Don't report submodules (e.g. django.x, django.y, django.z)
-                if ('.' in k):
+                # Skip modules that begin with underscore
+                if ('.' in k) or k[0] == '_':
                     continue
                 if m[k]:
                     try:
                         d = m[k].__dict__
                         if "version" in d and d["version"]:
-                            r[k] = self.jsonable(d["version"])
+                            res[k] = self.jsonable(d["version"])
                         elif "__version__" in d and d["__version__"]:
-                            r[k] = self.jsonable(d["__version__"])
+                            res[k] = self.jsonable(d["__version__"])
                         else:
-                            r[k] = "builtin"
-                    except Exception as e:
-                        r[k] = "unknown"
-                        log.debug("collect_modules: could not process module ", k, str(e))
-
-        except Exception as e:
-            log.debug(e.message)
+                            res[k] = get_distribution(k).version
+                    except DistributionNotFound:
+                        pass
+                    except Exception:
+                        log.debug("collect_modules: could not process module: %s" % k)
+
+        except Exception:
+            log.debug("collect_modules", exc_info=True)
         else:
-            return r
+            return res
 
     def collect_metrics(self):
         u = resource.getrusage(resource.RUSAGE_SELF)

instana/tracer.py

@@ -26,15 +26,14 @@ def __init__(self, options=o.Options()):
         self._propagators[ot.Format.HTTP_HEADERS] = HTTPPropagator()
         self._propagators[ot.Format.TEXT_MAP] = TextPropagator()
 
-
     def start_active_span(self,
-                            operation_name,
-                            child_of=None,
-                            references=None,
-                            tags=None,
-                            start_time=None,
-                            ignore_active_span=False,
-                            finish_on_close=True):
+                          operation_name,
+                          child_of=None,
+                          references=None,
+                          tags=None,
+                          start_time=None,
+                          ignore_active_span=False,
+                          finish_on_close=True):
 
         # create a new Span
         span = self.start_span(
@@ -48,7 +47,6 @@ def start_active_span(self,
 
         return self.scope_manager.activate(span, finish_on_close)
 
-
     def start_span(self,
                    operation_name=None,
                    child_of=None,
@@ -122,6 +120,7 @@ def init(options):
     """
     return internal_tracer
 
+
 def get_tracer():
     return internal_tracer
 

tests/test_api_client.py

@@ -6,15 +6,14 @@
 
 raise unittest.SkipTest("Manual tests due to API key requirement")
 
+
 class TestAPIClient(object):
     def setUp(self):
         """ Clear all spans before a test run """
         self.client = APIClient()
 
     def tearDown(self):
         """ Do nothing for now """
-        # after each test, tracer context should be None (not tracing)
-        # assert_equals(None, tracer.current_context())
         return None
 
     def test_tokens(self):