Use full module path for subclass.

Author: jonathangreen

aws_xray_sdk/ext/httplib/patch.py

@@ -102,8 +102,14 @@ def http_send_request_processor(wrapped, instance, args, kwargs, return_value,
         subsegment.add_exception(exception, stack)
 
 
-def _ignore_request(subclass, hostname, url):
+def _ignore_request(instance, hostname, url):
     global _XRAY_IGNORE
+    module = instance.__class__.__module__
+    if module is None or module == str.__class__.__module__:
+        subclass = instance.__class__.__name__
+    else:
+        subclass = module + '.' + instance.__class__.__name__
+    print(subclass)
     for rule in _XRAY_IGNORE:
         subclass_match = subclass == rule.subclass if rule.subclass is not None else True
         host_match = fnmatch.fnmatch(hostname, rule.hostname) if rule.hostname is not None else True
@@ -116,7 +122,7 @@ def _ignore_request(subclass, hostname, url):
 def _send_request(wrapped, instance, args, kwargs):
     def decompose_args(method, url, body, headers, encode_chunked=False):
         # skip any ignored requests
-        if _ignore_request(type(instance).__name__, instance.host, url):
+        if _ignore_request(instance, instance.host, url):
             return wrapped(*args, **kwargs)
 
         # Only injects headers when the subsegment for the outgoing

tests/ext/httplib/test_httplib.py

@@ -171,15 +171,16 @@ def test_ignore_hostname_glob():
     assert len(xray_recorder.current_segment().subsegments) == 0
 
 
-class TestClass(httplib.HTTPSConnection):
+class CustomHttpsConnection(httplib.HTTPSConnection):
     pass
 
 
 def test_ignore_subclass():
     from aws_xray_sdk.ext.httplib import add_ignored
     path = '/status/200'
-    add_ignored(subclass='TestClass')
-    conn = TestClass(BASE_URL)
+    subclass = 'tests.ext.httplib.test_httplib.CustomHttpsConnection'
+    add_ignored(subclass=subclass)
+    conn = CustomHttpsConnection(BASE_URL)
     conn.request('GET', path)
     conn.getresponse()
     assert len(xray_recorder.current_segment().subsegments) == 0
@@ -188,8 +189,9 @@ def test_ignore_subclass():
 def test_ignore_multiple_match():
     from aws_xray_sdk.ext.httplib import add_ignored
     path = '/status/200'
-    add_ignored(subclass='TestClass', hostname=BASE_URL)
-    conn = TestClass(BASE_URL)
+    subclass = 'tests.ext.httplib.test_httplib.CustomHttpsConnection'
+    add_ignored(subclass=subclass, hostname=BASE_URL)
+    conn = CustomHttpsConnection(BASE_URL)
     conn.request('GET', path)
     conn.getresponse()
     assert len(xray_recorder.current_segment().subsegments) == 0
@@ -198,8 +200,9 @@ def test_ignore_multiple_match():
 def test_ignore_multiple_no_match():
     from aws_xray_sdk.ext.httplib import add_ignored
     path = '/status/200'
-    add_ignored(subclass='TestClass', hostname='fake.host')
-    conn = TestClass(BASE_URL)
+    subclass = 'tests.ext.httplib.test_httplib.CustomHttpsConnection'
+    add_ignored(subclass=subclass, hostname='fake.host')
+    conn = CustomHttpsConnection(BASE_URL)
     conn.request('GET', path)
     conn.getresponse()
     assert len(xray_recorder.current_segment().subsegments) > 0