Make urllib3 childof current span; Add tests to validate

Author: pglombardo

instana/instrumentation/urllib3.py

@@ -8,7 +8,8 @@
 @wrapt.patch_function_wrapper('urllib3', 'PoolManager.urlopen')
 def urlopen_with_instana(wrapped, instance, args, kwargs):
     try:
-        span = instana.internal_tracer.start_span("urllib3")
+        context = instana.internal_tracer.current_context()
+        span = instana.internal_tracer.start_span("urllib3", child_of=context)
         span.set_tag(ext.HTTP_URL, args[1])
         span.set_tag(ext.HTTP_METHOD, args[0])
 
@@ -31,3 +32,6 @@ def urlopen_with_instana(wrapped, instance, args, kwargs):
     else:
         span.finish()
         return rv
+
+
+instana.log.debug("Instrumenting urllib3")

tests/test_urllib3.py

@@ -40,6 +40,9 @@ def test_get_request(self):
         assert_equals(None, second_span.error)
         assert_equals(None, second_span.ec)
 
+        assert_equals(second_span.t, first_span.t)
+        assert_equals(second_span.p, first_span.s)
+
     def test_put_request(self):
         span = tracer.start_span("test")
         r = self.http.request('PUT', 'http://127.0.0.1:5000/notfound')
@@ -60,6 +63,9 @@ def test_put_request(self):
         assert_equals(None, second_span.error)
         assert_equals(None, second_span.ec)
 
+        assert_equals(second_span.t, first_span.t)
+        assert_equals(second_span.p, first_span.s)
+
     def test_5xx_request(self):
         span = tracer.start_span("test")
         r = self.http.request('GET', 'http://127.0.0.1:5000/504')
@@ -80,6 +86,9 @@ def test_5xx_request(self):
         assert_equals(True, second_span.error)
         assert_equals(1, second_span.ec)
 
+        assert_equals(second_span.t, first_span.t)
+        assert_equals(second_span.p, first_span.s)
+
     def test_exception_logging(self):
         span = tracer.start_span("test")
         try:
@@ -104,6 +113,9 @@ def test_exception_logging(self):
         assert_equals(True, second_span.error)
         assert_equals(1, second_span.ec)
 
+        assert_equals(second_span.t, first_span.t)
+        assert_equals(second_span.p, first_span.s)
+
     def test_client_error(self):
         span = tracer.start_span("test")
 
@@ -130,3 +142,6 @@ def test_client_error(self):
         assert_equals("GET", second_span.data.http.method)
         assert_equals(True, second_span.error)
         assert_equals(1, second_span.ec)
+
+        assert_equals(second_span.t, first_span.t)
+        assert_equals(second_span.p, first_span.s)