Merge pull request #829 from DataDog/0.21-dev

Release 0.21.0

Author: brettlangdon

.circleci/config.yml

@@ -327,17 +327,17 @@ jobs:
     steps:
       - checkout
       - *restore_cache_step
-      - run: TOX_SKIP_DIST=False tox -e 'elasticsearch_contrib-{py27,py34,py35,py36}-elasticsearch{16,17,18,23,24,51,52,53,54,63}' --result-json /tmp/elasticsearch.results
-      - run: TOX_SKIP_DIST=False tox -e 'elasticsearch_contrib-{py27,py34,py35,py36}-elasticsearch1{100}' --result-json /tmp/elasticsearch1.results
-      - run: TOX_SKIP_DIST=False tox -e 'elasticsearch_contrib-{py27,py34,py35,py36}-elasticsearch2{50}' --result-json /tmp/elasticsearch2.results
-      - run: TOX_SKIP_DIST=False tox -e 'elasticsearch_contrib-{py27,py34,py35,py36}-elasticsearch5{50}' --result-json /tmp/elasticsearch5.results
+      - run:
+          command: |
+            tox -e 'elasticsearch_contrib-{py27,py34,py35,py36}-elasticsearch{16,17,18,23,24,51,52,53,54,63}' \
+                -e 'elasticsearch_contrib-{py27,py34,py35,py36}-elasticsearch1{100}' \
+                -e 'elasticsearch_contrib-{py27,py34,py35,py36}-elasticsearch2{50}' \
+                -e 'elasticsearch_contrib-{py27,py34,py35,py36}-elasticsearch5{50}' \
+                --result-json /tmp/elasticsearch.results
       - persist_to_workspace:
           root: /tmp
           paths:
             - elasticsearch.results
-            - elasticsearch1.results
-            - elasticsearch2.results
-            - elasticsearch5.results
       - *save_cache_step
 
   falcon:

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @DataDog/apm-python

ddtrace/__init__.py

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

ddtrace/api.py

@@ -7,6 +7,7 @@
 # project
 from .encoding import get_encoder, JSONEncoder
 from .compat import httplib, PYTHON_VERSION, PYTHON_INTERPRETER, get_connection_response
+from .utils.deprecation import deprecated
 
 
 log = logging.getLogger(__name__)
@@ -159,23 +160,9 @@ def send_traces(self, traces):
         log.debug("reported %d traces in %.5fs", len(traces), time.time() - start)
         return response
 
-    def send_services(self, services):
-        if not services:
-            return
-        s = {}
-        for service in services:
-            s.update(service)
-        data = self._encoder.encode_services(s)
-        response = self._put(self._services, data)
-
-        # 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._services, response.status)
-            self._downgrade()
-            return self.send_services(services)
-
-        log.debug("reported %d services", len(services))
-        return response
+    @deprecated(message='Sending services to the API is no longer necessary', version='1.0.0')
+    def send_services(self, *args, **kwargs):
+        return
 
     def _put(self, endpoint, data, count=0):
         conn = httplib.HTTPConnection(self.hostname, self.port)

ddtrace/compat.py

@@ -18,6 +18,7 @@
 
 PYTHON_VERSION_INFO = sys.version_info
 PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
 
 # Infos about python passed to the trace agent through the header
 PYTHON_VERSION = platform.python_version()
@@ -34,6 +35,7 @@
 Queue = six.moves.queue.Queue
 iteritems = six.iteritems
 reraise = six.reraise
+reload_module = six.moves.reload_module
 
 stringify = six.text_type
 string_type = six.string_types[0]

ddtrace/contrib/aiohttp/__init__.py

@@ -20,16 +20,16 @@
 Integration settings are attached to your application under the ``datadog_trace``
 namespace. You can read or update them as follows::
 
-    # activates distributed tracing for all received requests
-    app['datadog_trace']['distributed_tracing_enabled'] = True
+    # disables distributed tracing for all received requests
+    app['datadog_trace']['distributed_tracing_enabled'] = False
 
 Available settings are:
 
 * ``tracer`` (default: ``ddtrace.tracer``): set the default tracer instance that is used to
   trace `aiohttp` internals. By default the `ddtrace` tracer is used.
 * ``service`` (default: ``aiohttp-web``): set the service name used by the tracer. Usually
   this configuration must be updated with a meaningful name.
-* ``distributed_tracing_enabled`` (default: ``False``): enable distributed tracing during
+* ``distributed_tracing_enabled`` (default: ``True``): enable distributed tracing during
   the middleware execution, so that a new span is created with the given ``trace_id`` and
   ``parent_id`` injected via request headers.
 

ddtrace/contrib/aiohttp/middlewares.py

@@ -117,19 +117,12 @@ def trace_app(app, tracer, service='aiohttp-web'):
     app[CONFIG_KEY] = {
         'tracer': tracer,
         'service': service,
-        'distributed_tracing_enabled': False,
+        'distributed_tracing_enabled': True,
     }
 
     # the tracer must work with asynchronous Context propagation
     tracer.configure(context_provider=context_provider)
 
-    # configure the current service
-    tracer.set_service_info(
-        service=service,
-        app='aiohttp',
-        app_type=AppTypes.web,
-    )
-
     # add the async tracer middleware as a first middleware
     # and be sure that the on_prepare signal is the last one
     app.middlewares.insert(0, trace_middleware)

ddtrace/contrib/bottle/__init__.py

@@ -9,10 +9,6 @@
     app = bottle.Bottle()
     plugin = TracePlugin(service="my-web-app")
     app.install(plugin)
-
-To enable distributed tracing::
-
-    plugin = TracePlugin(service="my-web-app", distributed_tracing=True)
 """
 
 from ...utils.importlib import require_modules

ddtrace/contrib/bottle/trace.py

@@ -3,7 +3,7 @@
 
 # stdlib
 import ddtrace
-from ddtrace.ext import http, AppTypes
+from ddtrace.ext import http
 
 # project
 from ...constants import EVENT_SAMPLE_RATE_KEY
@@ -17,15 +17,10 @@ class TracePlugin(object):
     name = 'trace'
     api = 2
 
-    def __init__(self, service='bottle', tracer=None, distributed_tracing=None):
+    def __init__(self, service='bottle', tracer=None, distributed_tracing=True):
         self.service = service
         self.tracer = tracer or ddtrace.tracer
         self.distributed_tracing = distributed_tracing
-        self.tracer.set_service_info(
-            service=service,
-            app='bottle',
-            app_type=AppTypes.web,
-        )
 
     def apply(self, callback, route):
 

ddtrace/contrib/django/apps.py

@@ -10,9 +10,6 @@
 from .templates import patch_template
 from .middleware import insert_exception_middleware, insert_trace_middleware
 
-from ...ext import AppTypes
-
-
 log = logging.getLogger(__name__)
 
 
@@ -39,13 +36,6 @@ def ready(self):
         tracer.writer.api.hostname = settings.AGENT_HOSTNAME
         tracer.writer.api.port = settings.AGENT_PORT
 
-        # define the service details
-        tracer.set_service_info(
-            app='django',
-            app_type=AppTypes.web,
-            service=settings.DEFAULT_SERVICE,
-        )
-
         if settings.AUTO_INSTRUMENT:
             # trace Django internals
             insert_trace_middleware()