Improved tornado tests

Author: owais

instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py

@@ -82,6 +82,12 @@ def tearDown(self):
         self.traced_patch.stop()
         super().tearDown()
 
+    def find_span_by_name(self, spans, name):
+        for span in spans:
+            if span.name == name:
+                return span
+        self.fail('Span with name "{}" not found'.format(name))
+
 
 class TestTornadoInstrumentor(TornadoTest):
     def test_patch_references(self):
@@ -188,12 +194,16 @@ def _test_async_handler(self, url, handler_name):
         spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 5)
 
-        sub2, sub1, sub_wrapper, server, client = self.sorted_spans(spans)
+        client = self.find_span_by_name(spans, "GET")
+        server = self.find_span_by_name(spans, handler_name + ".get")
+        sub_wrapper = self.find_span_by_name(spans, "sub-task-wrapper")
 
+        sub2 = self.find_span_by_name(spans, "sub-task-2")
         self.assertEqual(sub2.name, "sub-task-2")
         self.assertEqual(sub2.parent, sub_wrapper.context)
         self.assertEqual(sub2.context.trace_id, client.context.trace_id)
 
+        sub1 = self.find_span_by_name(spans, "sub-task-1")
         self.assertEqual(sub1.name, "sub-task-1")
         self.assertEqual(sub1.parent, sub_wrapper.context)
         self.assertEqual(sub1.context.trace_id, client.context.trace_id)
@@ -238,9 +248,11 @@ def test_500(self):
         response = self.fetch("/error")
         self.assertEqual(response.code, 500)
 
-        spans = self.sorted_spans(self.memory_exporter.get_finished_spans())
+        spans = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans), 2)
-        server, client = spans
+
+        client = self.find_span_by_name(spans, "GET")
+        server = self.find_span_by_name(spans, "BadHandler.get")
 
         self.assertEqual(server.name, "BadHandler.get")
         self.assertEqual(server.kind, SpanKind.SERVER)

tox.ini

@@ -122,7 +122,8 @@ envlist =
     py3{6,7,8,9}-test-instrumentation-grpc
 
     ; opentelemetry-instrumentation-sqlalchemy
-    py3{6,7,8,9}-test-instrumentation-sqlalchemy{11,14}
+    py3{6,7}-test-instrumentation-sqlalchemy{11}
+    py3{6,7,8,9}-test-instrumentation-sqlalchemy{14}
     pypy3-test-instrumentation-sqlalchemy{11,14}
 
     ; opentelemetry-instrumentation-redis