Merge branch 'master' into correct_service_naming

Author: pglombardo

README.md

@@ -16,8 +16,6 @@ Any and all feedback is welcome.  Happy Python visibility.
 
 ## Installation
 
-For this BETA, we currently support tracing of Django and Flask applications or optionally just runtime monitoring of your Python applications.
-
 `pip install instana` into the virtual-env or container ([hosted on pypi](https://pypi.python.org/pypi/instana))
 
 ## Django

instana/agent.py

@@ -12,7 +12,7 @@
 
 class From(object):
     pid = ""
-    hostId = ""
+    agentUuid = ""
 
     def __init__(self, **kwds):
         self.__dict__.update(kwds)

instana/recorder.py

@@ -85,14 +85,17 @@ def build_registered_span(self, span):
                        baggage=span.context.baggage,
                        custom=sd.CustomData(tags=span.tags,
                                             logs=self.collect_logs(span)))
+        entityFrom = { 'e': self.sensor.agent.from_.pid,
+                       'h': self.sensor.agent.from_.agentUuid }
+
         return sd.InstanaSpan(
                     n=span.operation_name,
                     t=span.context.trace_id,
                     p=span.parent_id,
                     s=span.context.span_id,
                     ts=int(round(span.start_time * 1000)),
                     d=int(round(span.duration * 1000)),
-                    f=self.sensor.agent.from_,
+                    f=entityFrom,
                     ec=self.get_tag(span, "ec"),
                     error=self.get_tag(span, "error"),
                     data=data)
@@ -111,6 +114,8 @@ def build_sdk_span(self, span):
 
         sdk_data.Type = self.get_span_kind(span)
         data = sd.Data(service=self.get_service_name(span), sdk=sdk_data)
+        entityFrom = { 'e': self.sensor.agent.from_.pid,
+                       'h': self.sensor.agent.from_.agentUuid }
 
         return sd.InstanaSpan(
                     t=span.context.trace_id,
@@ -119,7 +124,7 @@ def build_sdk_span(self, span):
                     ts=int(round(span.start_time * 1000)),
                     d=int(round(span.duration * 1000)),
                     n="sdk",
-                    f=self.sensor.agent.from_,
+                    f=entityFrom,
                     data=data)
 
     def get_tag(self, span, tag):

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='instana',
-      version='0.6.1',
+      version='0.6.2',
       download_url='https://github.com/instana/python-sensor',
       url='https://www.instana.com/',
       license='MIT',