Bug fixes for test suite issues

instana/json_span.py

@@ -20,11 +20,10 @@ def __init__(self, span, kind, data, agent, **kwargs):
         self.p = span.parent_id
         self.s = span.context.span_id
         self.ts = int(round(span.start_time * 1000))
-        self.ta = "py"
         self.d = int(round(span.duration * 1000))
         self.f = agent.get_from_structure()
         self.ec = span.tags.pop("ec", None)
-        self.error = span.tags.pop("error", False)
+        self.error = span.tags.pop("error", None)
 
         if data.sdk:
             self.n = "sdk"
@@ -191,6 +190,7 @@ def __init__(self, span, **kwargs):
         self.db = span.tags.pop(ot_tags.DATABASE_INSTANCE, None)
         self.user = span.tags.pop(ot_tags.DATABASE_USER, None)
         self.stmt = span.tags.pop(ot_tags.DATABASE_STATEMENT, None)
+        self.error = span.tags.pop('error', None)
         super(MySQLData, self).__init__(**kwargs)
 
 

instana/recorder.py

@@ -152,10 +152,14 @@ def build_registered_span(self, span):
     def _populate_entry_span_data(self, span, data):
         if span.operation_name in self.http_spans:
             data.http = HttpData(span)
-        elif span.operation_name == "rpc-server":
-            data.rpc = RPCData(span)
         elif span.operation_name == "aws.lambda.entry":
             data.aws_lambda = AWSLambdaData(span)
+        elif span.operation_name == "rabbitmq":
+            data.rabbitmq = RabbitmqData(span)
+        elif span.operation_name == "rpc-server":
+            data.rpc = RPCData(span)
+        elif span.operation_name == "soap":
+            data.soap = SoapData(span)
         else:
             logger.debug("SpanRecorder: Unknown entry span: %s" % span.operation_name)
 

tests/test_ot_propagators.py

@@ -1,6 +1,5 @@
 import inspect
 
-import basictracer
 import opentracing as ot
 from nose.tools import assert_equals
 
@@ -23,8 +22,7 @@ def test_http_basics():
 
 
 def test_http_inject_with_dict():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {}
     span = ot.tracer.start_span("nosetests")
@@ -39,8 +37,7 @@ def test_http_inject_with_dict():
 
 
 def test_http_inject_with_list():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = []
     span = ot.tracer.start_span("nosetests")
@@ -52,8 +49,7 @@ def test_http_inject_with_list():
 
 
 def test_http_basic_extract():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {'X-Instana-T': '1', 'X-Instana-S': '1', 'X-Instana-L': '1'}
     ctx = ot.tracer.extract(ot.Format.HTTP_HEADERS, carrier)
@@ -64,8 +60,7 @@ def test_http_basic_extract():
 
 
 def test_http_mixed_case_extract():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {'x-insTana-T': '1', 'X-inSTANa-S': '1', 'X-INstana-l': '1'}
     ctx = ot.tracer.extract(ot.Format.HTTP_HEADERS, carrier)
@@ -76,8 +71,7 @@ def test_http_mixed_case_extract():
 
 
 def test_http_no_context_extract():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {}
     ctx = ot.tracer.extract(ot.Format.HTTP_HEADERS, carrier)
@@ -86,8 +80,7 @@ def test_http_no_context_extract():
 
 
 def test_http_128bit_headers():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {'X-Instana-T': '0000000000000000b0789916ff8f319f',
                'X-Instana-S': '0000000000000000b0789916ff8f319f', 'X-Instana-L': '1'}
@@ -111,8 +104,7 @@ def test_text_basics():
 
 
 def test_text_inject_with_dict():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {}
     span = ot.tracer.start_span("nosetests")
@@ -127,8 +119,7 @@ def test_text_inject_with_dict():
 
 
 def test_text_inject_with_list():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = []
     span = ot.tracer.start_span("nosetests")
@@ -140,8 +131,7 @@ def test_text_inject_with_list():
 
 
 def test_text_basic_extract():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {'X-INSTANA-T': '1', 'X-INSTANA-S': '1', 'X-INSTANA-L': '1'}
     ctx = ot.tracer.extract(ot.Format.TEXT_MAP, carrier)
@@ -152,8 +142,7 @@ def test_text_basic_extract():
 
 
 def test_text_mixed_case_extract():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {'x-insTana-T': '1', 'X-inSTANa-S': '1', 'X-INstana-l': '1'}
     ctx = ot.tracer.extract(ot.Format.TEXT_MAP, carrier)
@@ -162,8 +151,7 @@ def test_text_mixed_case_extract():
 
 
 def test_text_no_context_extract():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {}
     ctx = ot.tracer.extract(ot.Format.TEXT_MAP, carrier)
@@ -172,8 +160,7 @@ def test_text_no_context_extract():
 
 
 def test_text_128bit_headers():
-    opts = options.Options()
-    ot.tracer = InstanaTracer(opts)
+    ot.tracer = InstanaTracer()
 
     carrier = {'X-INSTANA-T': '0000000000000000b0789916ff8f319f',
                'X-INSTANA-S': ' 0000000000000000b0789916ff8f319f', 'X-INSTANA-L': '1'}