Merge pull request #27 from instana/better_entity_naming

Better entity naming

Author: pglombardo

example/simple.py

@@ -6,7 +6,7 @@
 import time
 import opentracing.ext.tags as ext
 
-SERVICE = "python-simple"
+SERVICE = "python-overlord"
 
 def main(argv):
     instana.tracer.init(o.Options(service=SERVICE,
@@ -17,16 +17,16 @@ def main(argv):
         simple()
 
 def simple():
-    parent_span = ot.tracer.start_span(operation_name="parent")
-    parent_span.set_tag(ext.COMPONENT, SERVICE)
+    parent_span = ot.tracer.start_span(operation_name="asteroid")
+    parent_span.set_tag(ext.COMPONENT, "Python simple example app")
     parent_span.set_tag(ext.SPAN_KIND, ext.SPAN_KIND_RPC_SERVER)
     parent_span.set_tag(ext.PEER_HOSTNAME, "localhost")
     parent_span.set_tag(ext.HTTP_URL, "/python/simple/one")
     parent_span.set_tag(ext.HTTP_METHOD, "GET")
     parent_span.set_tag(ext.HTTP_STATUS_CODE, 200)
     parent_span.log_kv({"foo": "bar"})
 
-    child_span = ot.tracer.start_span(operation_name="child", child_of=parent_span)
+    child_span = ot.tracer.start_span(operation_name="spacedust", child_of=parent_span)
     child_span.set_tag(ext.SPAN_KIND, ext.SPAN_KIND_RPC_CLIENT)
     child_span.set_tag(ext.PEER_HOSTNAME, "localhost")
     child_span.set_tag(ext.HTTP_URL, "/python/simple/two")

instana/meter.py

@@ -148,12 +148,14 @@ def process(self):
 
     def collect_snapshot(self):
         try:
-            if "FLASK_APP" in os.environ:
+            if self.sensor.service_name:
+                appname = self.sensor.service_name
+            elif "FLASK_APP" in os.environ:
                 appname = os.environ["FLASK_APP"]
             elif "DJANGO_SETTINGS_MODULE" in os.environ:
                 appname = os.environ["DJANGO_SETTINGS_MODULE"].split('.')[0]
             else:
-                appname = os.path.basename(sys.executable)
+                appname = os.path.basename(sys.argv[0])
 
             s = Snapshot(name=appname,
                          version=sys.version,