Merge '0.12-dev' into 'master'

Author: Emanuele Palazzetti

.circleci/config.yml

@@ -63,6 +63,26 @@ jobs:
           paths:
             - .tox
 
+  futures:
+    docker:
+      - image: datadog/docker-library:dd_trace_py_1_0_0
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+              - tox-cache-futures-{{ checksum "tox.ini" }}
+      - run: tox -e '{py27}-threading-futures{30,31,32}' --result-json /tmp/futures.1.results
+      - run: tox -e '{py34,py35,py36}-threading' --result-json /tmp/futures.2.results
+      - persist_to_workspace:
+          root: /tmp
+          paths:
+            - futures.1.results
+            - futures.2.results
+      - save_cache:
+          key: tox-cache-futures-{{ checksum "tox.ini" }}
+          paths:
+            - .tox
+
   boto:
     docker:
       - image: datadog/docker-library:dd_trace_py_1_0_0
@@ -164,15 +184,13 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-tornado-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27}-tornado{40,41,42,43,44}' --result-json /tmp/tornado.1.results
-      - run: tox -e '{py27}-tornado{40,41,42,43,44}-futures' --result-json /tmp/tornado.2.results
-      - run: tox -e '{py34,py35,py36}-tornado{40,41,42,43,44}' --result-json /tmp/tornado.3.results
+      - run: tox -e '{py27,py34,py35,py36}-tornado{40,41,42,43,44}' --result-json /tmp/tornado.1.results
+      - run: tox -e '{py27}-tornado{40,41,42,43,44}-futures{30,31,32}' --result-json /tmp/tornado.2.results
       - persist_to_workspace:
           root: /tmp
           paths:
             - tornado.1.results
             - tornado.2.results
-            - tornado.3.results
       - save_cache:
           key: tox-cache-tornado-{{ checksum "tox.ini" }}
           paths:
@@ -459,6 +477,31 @@ jobs:
           paths:
             - .tox
 
+  pymysql:
+    docker:
+      - image: datadog/docker-library:dd_trace_py_1_0_0
+      - image: mysql:5.7
+        env:
+            - MYSQL_ROOT_PASSWORD=admin
+            - MYSQL_PASSWORD=test
+            - MYSQL_USER=test
+            - MYSQL_DATABASE=test
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+              - tox-cache-pymysql-{{ checksum "tox.ini" }}
+      - run: tox -e 'wait' mysql
+      - run: tox -e '{py27,py34,py35,py36}-pymysql{07,08}' --result-json /tmp/pymysql.results
+      - persist_to_workspace:
+          root: /tmp
+          paths:
+            - pymysql.results
+      - save_cache:
+          key: tox-cache-pymysql-{{ checksum "tox.ini" }}
+          paths:
+            - .tox
+
   pylibmc:
     docker:
       - image: datadog/docker-library:dd_trace_py_1_0_0
@@ -744,6 +787,7 @@ workflows:
       - flake8
       - tracer
       - integration
+      - futures
       - boto
       - ddtracerun
       - asyncio
@@ -762,6 +806,7 @@ workflows:
       - mysqlconnector
       - mysqlpython
       - mysqldb
+      - pymysql
       - pylibmc
       - pymongo
       - pyramid
@@ -778,6 +823,7 @@ workflows:
             - flake8
             - tracer
             - integration
+            - futures
             - boto
             - ddtracerun
             - asyncio
@@ -796,6 +842,7 @@ workflows:
             - mysqlconnector
             - mysqlpython
             - mysqldb
+            - pymysql
             - pylibmc
             - pymongo
             - pyramid

ddtrace/__init__.py

@@ -2,11 +2,13 @@
 from .pin import Pin
 from .span import Span
 from .tracer import Tracer
+from .settings import Config
 
-__version__ = '0.11.1'
+__version__ = '0.12.0'
 
-# a global tracer instance
+# a global tracer instance with integration settings
 tracer = Tracer()
+config = Config()
 
 __all__ = [
     'patch',
@@ -15,4 +17,5 @@
     'Span',
     'tracer',
     'Tracer',
+    'config',
 ]

ddtrace/bootstrap/sitecustomize.py

@@ -4,9 +4,11 @@
 """
 
 import os
+import imp
+import sys
 import logging
 
-from ddtrace.util import asbool
+from ddtrace.utils.formats import asbool
 
 
 debug = os.environ.get("DATADOG_TRACE_DEBUG")
@@ -46,6 +48,8 @@ def update_patched_modules():
     patch = True
 
     # Respect DATADOG_* environment variables in global tracer configuration
+    # TODO: these variables are deprecated; use utils method and update our documentation
+    # correct prefix should be DD_*
     enabled = os.environ.get("DATADOG_TRACE_ENABLED")
     hostname = os.environ.get("DATADOG_TRACE_AGENT_HOSTNAME")
     port = os.environ.get("DATADOG_TRACE_AGENT_PORT")
@@ -76,5 +80,24 @@ def update_patched_modules():
 
     if 'DATADOG_ENV' in os.environ:
         tracer.set_tags({"env": os.environ["DATADOG_ENV"]})
+
+    # Ensure sitecustomize.py is properly called if available in application directories:
+    # * exclude `bootstrap_dir` from the search
+    # * find a user `sitecustomize.py` module
+    # * import that module via `imp`
+    bootstrap_dir = os.path.dirname(__file__)
+    path = list(sys.path)
+    path.remove(bootstrap_dir)
+
+    try:
+        (f, path, description) = imp.find_module('sitecustomize', path)
+    except ImportError:
+        pass
+    else:
+        # `sitecustomize.py` found, load it
+        log.debug('sitecustomize from user found in: %s', path)
+        imp.load_module('sitecustomize', f, path, description)
+
+
 except Exception as e:
     log.warn("error configuring Datadog tracing", exc_info=True)

ddtrace/compat.py

@@ -26,9 +26,9 @@
     from io import StringIO
 
 try:
-    import urlparse
+    import urlparse as parse
 except ImportError:
-    from urllib import parse as urlparse
+    from urllib import parse
 
 try:
     from asyncio import iscoroutinefunction
@@ -88,5 +88,5 @@ def to_unicode(s):
     'stringify',
     'StringIO',
     'urlencode',
-    'urlparse',
+    'parse',
 ]

ddtrace/contrib/__init__.py

@@ -1 +1 @@
-from .util import func_name, module_name, require_modules  # noqa
+from ..utils.importlib import func_name, module_name, require_modules  # noqa

ddtrace/contrib/aiobotocore/__init__.py

@@ -18,7 +18,7 @@
     # This query generates a trace
     lambda_client.list_functions()
 """
-from ..util import require_modules
+from ...utils.importlib import require_modules
 
 
 required_modules = ['aiobotocore.client']

ddtrace/contrib/aiobotocore/patch.py

@@ -2,13 +2,13 @@
 import wrapt
 import aiobotocore.client
 
-from ddtrace import Pin
-from ddtrace.util import deep_getattr, unwrap
-
 from aiobotocore.endpoint import ClientResponseContentProxy
 
+from ...pin import Pin
 from ...ext import http, aws
 from ...compat import PYTHON_VERSION_INFO
+from ...utils.formats import deep_getattr
+from ...utils.wrappers import unwrap
 
 
 ARGS_NAME = ('action', 'params', 'path', 'verb')

ddtrace/contrib/aiohttp/__init__.py

@@ -44,7 +44,7 @@ async def home_handler(request):
         ctx = request['datadog_context']
         # do something with the tracing Context
 """
-from ..util import require_modules
+from ...utils.importlib import require_modules
 
 required_modules = ['aiohttp']
 

ddtrace/contrib/aiohttp/patch.py

@@ -1,7 +1,7 @@
 import wrapt
 
 from ...pin import Pin
-from ddtrace.util import unwrap
+from ...utils.wrappers import unwrap
 
 
 try:

ddtrace/contrib/aiopg/__init__.py

@@ -15,7 +15,7 @@
     # Use a pin to specify metadata related to this connection
     Pin.override(db, service='postgres-users')
 """
-from ..util import require_modules
+from ...utils.importlib import require_modules
 
 
 required_modules = ['aiopg']