Merge pull request #881 from DataDog/0.24-dev

0.24.0

Author: majorgreys

.circleci/config.yml

@@ -41,7 +41,6 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
-nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/

.gitignore

@@ -46,29 +46,9 @@ launch them through:
 [docker-compose]: https://www.docker.com/products/docker-compose
 
 
-#### Running the Tests in your local environment
-
-Once docker is up and running you should be able to run the tests. To launch a
-single test manually. For example to run the tests for `redis-py` 2.10 on Python
-3.5 and 3.6:
-
-    $ tox -e '{py35,py36}-redis{210}'
-
-To see the defined test commands see `tox.ini`.
-
-To launch the complete test matrix run:
-
-    $ tox
-
-
 #### Running Tests in docker
 
-If you prefer not to setup your local machine to run tests, we provide a preconfigured docker image.
-Note that this image is the same used in CircleCI to run tests.
-
-You still need docker containers running additional services up and running.
-
-Run the test runner
+Once your docker-compose environment is running, you can run the test runner image:
 
     $ docker-compose run --rm testrunner
 

README.md

@@ -12,13 +12,9 @@ S3_BUCKET = "pypi.datadoghq.com"
 
 desc "release the a new wheel"
 task :'release:wheel' do
-  # Use mkwheelhouse to build the wheel, push it to S3 then update the repo index
-  # If at some point, we need only the 2 first steps:
-  #  - python setup.py bdist_wheel
-  #  - aws s3 cp dist/*.whl s3://pypi.datadoghq.com/#{s3_dir}/
   fail "Missing environment variable S3_DIR" if !S3_DIR or S3_DIR.empty?
 
-  # Use custom mkwheelhouse script to build and upload an sdist to S3 bucket
+  # Use custom `mkwheelhouse` to upload wheels and source distribution from dist/ to S3 bucket
   sh "scripts/mkwheelhouse"
 end
 
@@ -66,6 +62,7 @@ namespace :pypi do
 
   task :build => :clean do
     puts "building release in #{RELEASE_DIR}"
+    # TODO: Use `scripts/build-dist` instead to build sdist and wheels
     sh "python setup.py -q sdist -d #{RELEASE_DIR}"
   end
 

Rakefile

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

ddtrace/__init__.py

@@ -46,7 +46,10 @@
 
 
 def update_patched_modules():
-    for patch in os.environ.get("DATADOG_PATCH_MODULES", '').split(','):
+    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")
             continue
@@ -95,6 +98,8 @@ def add_global_tags(tracer):
     if priority_sampling:
         opts["priority_sampling"] = asbool(priority_sampling)
 
+    opts['collect_metrics'] = asbool(get_env('runtime_metrics', 'enabled'))
+
     if opts:
         tracer.configure(**opts)
 

ddtrace/bootstrap/sitecustomize.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-from __future__ import print_function
-
 from distutils import spawn
 import os
 import sys

ddtrace/commands/ddtrace_run.py

@@ -78,7 +78,7 @@ def insert_tween_if_needed(settings):
     # pyramid.  We need our tween to be before it, otherwise unhandled
     # exceptions will be caught before they reach our tween.
     idx = tweens.find(pyramid.tweens.EXCVIEW)
-    if idx is -1:
+    if idx == -1:
         settings['pyramid.tweens'] = tweens + '\n' + DD_TWEEN_NAME
     else:
         settings['pyramid.tweens'] = tweens[:idx] + DD_TWEEN_NAME + "\n" + tweens[idx:]

ddtrace/contrib/pyramid/patch.py

@@ -58,7 +58,7 @@ def notify(self):
             'analytics_enabled': False,
             'settings': {
                 'FILTERS':  [
-                    FilterRequestsOnUrl(r'http://test\.example\.com'),
+                    FilterRequestsOnUrl(r'http://test\\.example\\.com'),
                 ],
             },
         },

ddtrace/contrib/tornado/__init__.py

@@ -18,15 +18,15 @@ class FilterRequestsOnUrl(object):
 
     To filter out http calls to domain api.example.com::
 
-        FilterRequestsOnUrl(r'http://api\.example\.com')
+        FilterRequestsOnUrl(r'http://api\\.example\\.com')
 
     To filter out http calls to all first level subdomains from example.com::
 
-        FilterRequestOnUrl(r'http://.*+\.example\.com')
+        FilterRequestOnUrl(r'http://.*+\\.example\\.com')
 
     To filter out calls to both http://test.example.com and http://example.com/healthcheck::
 
-        FilterRequestOnUrl([r'http://test\.example\.com', r'http://example\.com/healthcheck'])
+        FilterRequestOnUrl([r'http://test\\.example\\.com', r'http://example\\.com/healthcheck'])
     """
     def __init__(self, regexps):
         if isinstance(regexps, str):