Merge pull request #918 from DataDog/0.25-dev

0.25.0

Author: majorgreys

.circleci/config.yml

@@ -62,6 +62,10 @@ For example to run the tests for `redis-py` 2.10 on Python 3.5 and 3.6:
 
     $ ./scripts/ddtest tox -e '{py35,py36}-redis{210}'
 
+If you want to run a list of tox environment (as CircleCI does) based on a
+pattern, you can use the following command:
+
+    $ scripts/ddtest scripts/run-tox-scenario '^futures_contrib-'
 
 ### Continuous Integration
 

README.md

@@ -4,7 +4,7 @@
 from .tracer import Tracer
 from .settings import config
 
-__version__ = '0.24.0'
+__version__ = '0.25.0'
 
 # a global tracer instance with integration settings
 tracer = Tracer()

ddtrace/__init__.py

@@ -102,7 +102,7 @@ class API(object):
     """
     def __init__(self, hostname, port, headers=None, encoder=None, priority_sampling=False):
         self.hostname = hostname
-        self.port = port
+        self.port = int(port)
 
         self._headers = headers or {}
         self._version = None
@@ -158,11 +158,11 @@ def send_traces(self, traces):
 
         # the API endpoint is not available so we should downgrade the connection and re-try the call
         if response.status in [404, 415] and self._fallback:
-            log.debug('calling endpoint "%s" but received %s; downgrading API', self._traces, response.status)
+            log.debug("calling endpoint '%s' but received %s; downgrading API", self._traces, response.status)
             self._downgrade()
             return self.send_traces(traces)
 
-        log.debug("reported %d traces in %.5fs", len(traces), time.time() - start)
+        log.debug('reported %d traces in %.5fs', len(traces), time.time() - start)
         return response
 
     @deprecated(message='Sending services to the API is no longer necessary', version='1.0.0')
@@ -177,7 +177,7 @@ def _put(self, endpoint, data, count=0):
                 headers = dict(self._headers)
                 headers[TRACE_COUNT_HEADER] = str(count)
 
-            conn.request("PUT", endpoint, data, headers)
+            conn.request('PUT', endpoint, data, headers)
 
             # Parse the HTTPResponse into an API.Response
             # DEV: This will call `resp.read()` which must happen before the `conn.close()` below,

ddtrace/api.py

@@ -20,43 +20,43 @@
     # immediately patch logging if trace id injected
     from ddtrace import patch; patch(logging=True)  # noqa
 
-debug = os.environ.get("DATADOG_TRACE_DEBUG")
+debug = os.environ.get('DATADOG_TRACE_DEBUG')
 
 # Set here a default logging format for basicConfig
 
 # DEV: Once basicConfig is called here, future calls to it cannot be used to
 # change the formatter since it applies the formatter to the root handler only
 # upon initializing it the first time.
 # See https://github.com/python/cpython/blob/112e4afd582515fcdcc0cde5012a4866e5cfda12/Lib/logging/__init__.py#L1550
-if debug and debug.lower() == "true":
+if debug and debug.lower() == 'true':
     logging.basicConfig(level=logging.DEBUG, format=DD_LOG_FORMAT)
 else:
     logging.basicConfig(format=DD_LOG_FORMAT)
 
 log = get_logger(__name__)
 
 EXTRA_PATCHED_MODULES = {
-    "bottle": True,
-    "django": True,
-    "falcon": True,
-    "flask": True,
-    "pylons": True,
-    "pyramid": True,
+    'bottle': True,
+    'django': True,
+    'falcon': True,
+    'flask': True,
+    'pylons': True,
+    'pyramid': True,
 }
 
 
 def update_patched_modules():
-    modules_to_patch = os.environ.get("DATADOG_PATCH_MODULES")
+    modules_to_patch = os.environ.get('DATADOG_PATCH_MODULES')
     if not modules_to_patch:
         return
     for patch in modules_to_patch.split(','):
         if len(patch.split(':')) != 2:
-            log.debug("skipping malformed patch instruction")
+            log.debug('skipping malformed patch instruction')
             continue
 
         module, should_patch = patch.split(':')
         if should_patch.lower() not in ['true', 'false']:
-            log.debug("skipping malformed patch instruction for %s", module)
+            log.debug('skipping malformed patch instruction for %s', module)
             continue
 
         EXTRA_PATCHED_MODULES.update({module: should_patch.lower() == 'true'})
@@ -81,22 +81,22 @@ def add_global_tags(tracer):
     # 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")
+    enabled = os.environ.get('DATADOG_TRACE_ENABLED')
     hostname = os.environ.get('DD_AGENT_HOST', os.environ.get('DATADOG_TRACE_AGENT_HOSTNAME'))
-    port = os.environ.get("DATADOG_TRACE_AGENT_PORT")
-    priority_sampling = os.environ.get("DATADOG_PRIORITY_SAMPLING")
+    port = os.environ.get('DATADOG_TRACE_AGENT_PORT')
+    priority_sampling = os.environ.get('DATADOG_PRIORITY_SAMPLING')
 
     opts = {}
 
-    if enabled and enabled.lower() == "false":
-        opts["enabled"] = False
+    if enabled and enabled.lower() == 'false':
+        opts['enabled'] = False
         patch = False
     if hostname:
-        opts["hostname"] = hostname
+        opts['hostname'] = hostname
     if port:
-        opts["port"] = int(port)
+        opts['port'] = int(port)
     if priority_sampling:
-        opts["priority_sampling"] = asbool(priority_sampling)
+        opts['priority_sampling'] = asbool(priority_sampling)
 
     opts['collect_metrics'] = asbool(get_env('runtime_metrics', 'enabled'))
 
@@ -110,12 +110,12 @@ def add_global_tags(tracer):
         update_patched_modules()
         from ddtrace import patch_all; patch_all(**EXTRA_PATCHED_MODULES) # noqa
 
-    debug = os.environ.get("DATADOG_TRACE_DEBUG")
-    if debug and debug.lower() == "true":
+    debug = os.environ.get('DATADOG_TRACE_DEBUG')
+    if debug and debug.lower() == 'true':
         tracer.debug_logging = True
 
     if 'DATADOG_ENV' in os.environ:
-        tracer.set_tags({"env": os.environ["DATADOG_ENV"]})
+        tracer.set_tags({'env': os.environ['DATADOG_ENV']})
 
     if 'DD_TRACE_GLOBAL_TAGS' in os.environ:
         add_global_tags(tracer)
@@ -145,4 +145,4 @@ def add_global_tags(tracer):
     loaded = True
 except Exception as e:
     loaded = False
-    log.warn("error configuring Datadog tracing", exc_info=True)
+    log.warn('error configuring Datadog tracing', exc_info=True)

ddtrace/bootstrap/sitecustomize.py

@@ -4,8 +4,8 @@
 import sys
 import logging
 
-debug = os.environ.get("DATADOG_TRACE_DEBUG")
-if debug and debug.lower() == "true":
+debug = os.environ.get('DATADOG_TRACE_DEBUG')
+if debug and debug.lower() == 'true':
     logging.basicConfig(level=logging.DEBUG)
 
 # Do not use `ddtrace.internal.logger.get_logger` here
@@ -50,33 +50,33 @@ def _add_bootstrap_to_pythonpath(bootstrap_dir):
     python_path = os.environ.get('PYTHONPATH', '')
 
     if python_path:
-        new_path = "%s%s%s" % (bootstrap_dir, os.path.pathsep, os.environ['PYTHONPATH'])
+        new_path = '%s%s%s' % (bootstrap_dir, os.path.pathsep, os.environ['PYTHONPATH'])
         os.environ['PYTHONPATH'] = new_path
     else:
         os.environ['PYTHONPATH'] = bootstrap_dir
 
 
 def main():
-    if len(sys.argv) < 2 or sys.argv[1] == "-h":
+    if len(sys.argv) < 2 or sys.argv[1] == '-h':
         print(USAGE)
         return
 
-    log.debug("sys.argv: %s", sys.argv)
+    log.debug('sys.argv: %s', sys.argv)
 
     root_dir = _ddtrace_root()
-    log.debug("ddtrace root: %s", root_dir)
+    log.debug('ddtrace root: %s', root_dir)
 
     bootstrap_dir = os.path.join(root_dir, 'bootstrap')
-    log.debug("ddtrace bootstrap: %s", bootstrap_dir)
+    log.debug('ddtrace bootstrap: %s', bootstrap_dir)
 
     _add_bootstrap_to_pythonpath(bootstrap_dir)
-    log.debug("PYTHONPATH: %s", os.environ['PYTHONPATH'])
-    log.debug("sys.path: %s", sys.path)
+    log.debug('PYTHONPATH: %s', os.environ['PYTHONPATH'])
+    log.debug('sys.path: %s', sys.path)
 
     executable = sys.argv[1]
 
     # Find the executable path
     executable = spawn.find_executable(executable)
-    log.debug("program executable: %s", executable)
+    log.debug('program executable: %s', executable)
 
     os.execl(executable, executable, *sys.argv[2:])

ddtrace/commands/ddtrace_run.py

@@ -5,3 +5,6 @@
 ORIGIN_KEY = '_dd.origin'
 
 NUMERIC_TAGS = (ANALYTICS_SAMPLE_RATE_KEY, )
+
+MANUAL_DROP_KEY = 'manual.drop'
+MANUAL_KEEP_KEY = 'manual.keep'

ddtrace/constants.py

@@ -99,7 +99,7 @@ def on_prepare(request, response):
     request_span.resource = resource
     request_span.set_tag('http.method', request.method)
     request_span.set_tag('http.status_code', response.status)
-    request_span.set_tag('http.url', request.path)
+    request_span.set_tag(http.URL, request.url.with_query(None))
     request_span.finish()
 
 

ddtrace/contrib/aiohttp/middlewares.py

@@ -0,0 +1,32 @@
+"""
+The Algoliasearch__ integration will add tracing to your Algolia searches.
+
+::
+
+    from ddtrace import patch_all
+    patch_all()
+
+    from algoliasearch import algoliasearch
+    client = alogliasearch.Client(<ID>, <API_KEY>)
+    index = client.init_index(<INDEX_NAME>)
+    index.search("your query", args={"attributesToRetrieve": "attribute1,attribute1"})
+
+Configuration
+~~~~~~~~~~~~~
+
+.. py:data:: ddtrace.config.algoliasearch['collect_query_text']
+
+   Whether to pass the text of your query onto Datadog. Since this may contain sensitive data it's off by default
+
+   Default: ``False``
+
+.. __: https://www.algolia.com
+"""
+
+from ...utils.importlib import require_modules
+
+with require_modules(['algoliasearch', 'algoliasearch.version']) as missing_modules:
+    if not missing_modules:
+        from .patch import patch, unpatch
+
+        __all__ = ['patch', 'unpatch']