feat: improve robustness of custom service naming

Previously, we only added span.data.service to _entry_ spans (when
the environment variable INSTANA_SERVICE_NAME is set). The
requirements around this have changed, now we add this annotation to
_all_ spans (but still only if it has been explicitly configured).

Signed-off-by: Bastian Krol <[email protected]>

Author: Bastian Krol

instana/span.py

@@ -203,7 +203,7 @@ def __init__(self, span, source, service_name, **kwargs):
         self.n = "sdk"
         self.k = span_kind[1]
 
-        if self.k == 1 and service_name is not None:
+        if service_name is not None:
             self.data["service"] = service_name
 
         self.data["sdk"]["name"] = span.operation_name
@@ -263,10 +263,10 @@ def __init__(self, span, source, service_name, **kwargs):
         self.n = span.operation_name
         self.k = 1
 
+        self.data["service"] = service_name
         if span.operation_name in self.ENTRY_SPANS:
             # entry
             self._populate_entry_span_data(span)
-            self.data["service"] = service_name
             self._populate_extra_span_attributes(span)
         elif span.operation_name in self.EXIT_SPANS:
             self.k = 2  # exit

tests/opentracing/test_ot_span.py

@@ -269,7 +269,6 @@ def test_custom_service_name(self):
         exit_span = get_first_span_by_filter(spans, filter)
         assert (exit_span)
 
-        # Custom service name should be set on ENTRY spans and none other
         assert(entry_span)
         assert(len(entry_span.data['sdk']['custom']['tags']) == 2)
         assert(entry_span.data['sdk']['custom']['tags']['type'] == 'entry_span')
@@ -279,13 +278,13 @@ def test_custom_service_name(self):
         assert(intermediate_span)
         assert(len(intermediate_span.data['sdk']['custom']['tags']) == 1)
         assert(intermediate_span.data['sdk']['custom']['tags']['type'] == 'intermediate_span')
-        assert("service" not in intermediate_span.data)
+        assert(intermediate_span.data['service'] == 'custom_service_name')
         assert(intermediate_span.k == 3)
 
         assert(exit_span)
         assert(len(exit_span.data['sdk']['custom']['tags']) == 2)
         assert(exit_span.data['sdk']['custom']['tags']['type'] == 'exit_span')
-        assert("service" not in intermediate_span.data)
+        assert(exit_span.data['service'] == 'custom_service_name')
         assert(exit_span.k == 2)
 
     def test_span_log(self):