[core] vendor wrapt and six dependencies (#755)

* [core] vendor six and replace custom compat functions

* make_async_decorator

* Add docs about dependencies

* [core] vendor wrapt==1.10.11

* Add wrapt and wrapt/_wrappers.c to setup.py

* update wrapt imports

* move ddtrace/vendor to a top level ddtrace_vendor package

* ddtrace.vendor -> ddtrace_vendor

* Add note about second package

* fix testing with ddtrace_vendor

* remove unused import

* move ddtrace_vendor back to ddtrace.vendor

* s/ddtrace_vendor/ddtrace.vendor/g

* we need to use find_packages

* upgrade wrapt to 1.11.1

* ensure we are using ddtrace.wrapt everywhere

* missed another 'import wrapt'

* Fix ddtrace.contrib.pyramid package searching

* fix boto tests

* fix linting issue

* remove import in test/contrib/__init__.py

* simplify logic

* Add debug print statement if we cannot install wrapt C-extension

Author: brettlangdon

ddtrace/compat.py

@@ -2,7 +2,7 @@
 import sys
 import textwrap
 
-import six
+from ddtrace.vendor import six
 
 __all__ = [
     'httplib',

ddtrace/contrib/aiobotocore/patch.py

@@ -1,5 +1,5 @@
 import asyncio
-import wrapt
+from ddtrace.vendor import wrapt
 import aiobotocore.client
 
 from aiobotocore.endpoint import ClientResponseContentProxy

ddtrace/contrib/aiohttp/patch.py

@@ -1,4 +1,4 @@
-import wrapt
+from ddtrace.vendor import wrapt
 
 from ...pin import Pin
 from ...utils.wrappers import unwrap

ddtrace/contrib/aiopg/connection.py

@@ -1,5 +1,5 @@
 import asyncio
-import wrapt
+from ddtrace.vendor import wrapt
 
 from aiopg.utils import _ContextManager
 

ddtrace/contrib/aiopg/patch.py

@@ -3,7 +3,7 @@
 
 import aiopg.connection
 import psycopg2.extensions
-import wrapt
+from ddtrace.vendor import wrapt
 
 from .connection import AIOTracedConnection
 from ..psycopg.patch import _patch_extensions, \

ddtrace/contrib/asyncio/patch.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from wrapt import wrap_function_wrapper as _w
+from ddtrace.vendor.wrapt import wrap_function_wrapper as _w
 
 from .helpers import _wrapped_create_task
 from ...utils.wrappers import unwrap as _u

ddtrace/contrib/boto/patch.py

@@ -1,5 +1,5 @@
 import boto.connection
-import wrapt
+from ddtrace.vendor import wrapt
 import inspect
 
 from ...pin import Pin
@@ -105,10 +105,15 @@ def patched_auth_request(original_func, instance, args, kwargs):
 
     # Catching the name of the operation that called make_request()
     operation_name = None
+
+    # Go up the stack until we get the first non-ddtrace module
+    # DEV: For `lambda.list_functions()` this should be:
+    #        - ddtrace.contrib.boto.patch
+    #        - ddtrace.vendor.wrapt.wrappers
+    #        - boto.awslambda.layer1 (make_request)
+    #        - boto.awslambda.layer1 (list_functions)
     frame = inspect.currentframe()
-    # go up the call stack twice to get into the boto frame
-    boto_frame = frame.f_back.f_back
-    operation_name = boto_frame.f_code.co_name
+    operation_name = frame.f_back.f_back.f_back.f_code.co_name
 
     pin = Pin.get_from(instance)
     if not pin or not pin.enabled():

ddtrace/contrib/botocore/patch.py

@@ -2,7 +2,7 @@
 Trace queries to aws api done via botocore client
 """
 # 3p
-import wrapt
+from ddtrace.vendor import wrapt
 import botocore.client
 
 # project

ddtrace/contrib/bottle/patch.py

@@ -4,7 +4,7 @@
 
 import bottle
 
-import wrapt
+from ddtrace.vendor import wrapt
 
 
 def patch():

ddtrace/contrib/cassandra/session.py

@@ -5,7 +5,7 @@
 import logging
 # 3p
 import cassandra.cluster
-import wrapt
+from ddtrace.vendor import wrapt
 
 # project
 from ddtrace import Pin