Expanded span.kind support & tests.

Author: pglombardo

instana/recorder.py

@@ -3,14 +3,16 @@
 import threading as t
 import opentracing.ext.tags as ext
 import socket
-import instana.span_data as sd
+import instana.span as sd
 import Queue
 import time
 
 
 class InstanaRecorder(SpanRecorder):
     sensor = None
     registered_spans = ("memcache", "rpc-client", "rpc-server")
+    entry_kind = ["entry", "server", "consumer"]
+    exit_kind = ["exit", "client", "producer"]
     queue = Queue.Queue()
 
     def __init__(self, sensor):
@@ -101,7 +103,13 @@ def build_sdk_span(self, span):
         )
 
         if "span.kind" in span.tags:
-            sdk_data.Type = span.tags["span.kind"]
+            if span.tags["span.kind"] in self.entry_kind:
+                sdk_data.Type = "entry"
+            elif span.tags["span.kind"] in self.exit_kind:
+                sdk_data.Type = "exit"
+            else:
+                sdk_data.Type = "local"
+
 
         data = sd.Data(service=self.get_service_name(span),
                        sdk=sdk_data)

tests/test_ot_span.py

@@ -85,3 +85,44 @@ def test_sdk_spans(self):
         assert_equals('entry', sdk_span.data.sdk.Type)
         assert sdk_span.data.sdk.Custom
         assert sdk_span.data.sdk.Custom.tags
+
+    def test_span_kind(self):
+        recorder = opentracing.global_tracer.recorder
+
+        span = opentracing.global_tracer.start_span("custom_sdk_span")
+        span.set_tag('span.kind', "consumer")
+        span.finish()
+
+        span = opentracing.global_tracer.start_span("custom_sdk_span")
+        span.set_tag('span.kind', "server")
+        span.finish()
+
+        span = opentracing.global_tracer.start_span("custom_sdk_span")
+        span.set_tag('span.kind', "producer")
+        span.finish()
+
+        span = opentracing.global_tracer.start_span("custom_sdk_span")
+        span.set_tag('span.kind', "client")
+        span.finish()
+
+        span = opentracing.global_tracer.start_span("custom_sdk_span")
+        span.set_tag('span.kind', "blah")
+        span.finish()
+
+        spans = recorder.queued_spans()
+        assert 5, len(spans)
+
+        span = spans[0]
+        assert_equals('entry', span.data.sdk.Type)
+
+        span = spans[1]
+        assert_equals('entry', span.data.sdk.Type)
+
+        span = spans[2]
+        assert_equals('exit', span.data.sdk.Type)
+
+        span = spans[3]
+        assert_equals('exit', span.data.sdk.Type)
+
+        span = spans[4]
+        assert_equals('local', span.data.sdk.Type)