Respect INSTANA_SERVICE_NAME consistently. (#116)

* Respect INSTANA_SERVICE_NAME consistently.

* Service name is in snapshot

Author: pglombardo

instana/meter.py

@@ -201,7 +201,9 @@ def handle_agent_tasks(self, task):
     def collect_snapshot(self):
         """  Collects snapshot related information to this process and environment """
         try:
-            if "FLASK_APP" in os.environ:
+            if "INSTANA_SERVICE_NAME" in os.environ:
+                appname = os.environ["INSTANA_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]

instana/options.py

@@ -3,7 +3,7 @@
 
 
 class Options(object):
-    service = ''
+    service = None
     service_name = None
     agent_host = ''
     agent_port = 0

instana/recorder.py

@@ -191,7 +191,8 @@ def build_sdk_span(self, span):
                            custom=custom_data)
 
         sdk_data.Type = self.get_span_kind(span)
-        data = Data(service=self.get_service_name(span), sdk=sdk_data)
+        data = Data(service=instana.singletons.agent.sensor.options.service_name,
+                    sdk=sdk_data)
         entity_from = {'e': instana.singletons.agent.from_.pid,
                       'h': instana.singletons.agent.from_.agentUuid}
 
@@ -225,9 +226,6 @@ def get_http_host_name(self, span):
 
         return "localhost"
 
-    def get_service_name(self, span):
-        return instana.singletons.agent.sensor.options.service_name
-
     def get_span_kind(self, span):
         kind = ""
         if "span.kind" in span.tags: