[core] Remove sending of service info (#811)

* [core] remove all service sending code

* fix tests asserting on services

* remove unused import

* remove final references to Tracer._services

* fix missing pop_services assertion

* remove unused import

* Update ddtrace/tracer.py

Author: brettlangdon

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/contrib/aiohttp/middlewares.py

@@ -123,13 +123,6 @@ def trace_app(app, tracer, service='aiohttp-web'):
     # 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/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
@@ -21,11 +21,6 @@ def __init__(self, service='bottle', tracer=None, distributed_tracing=None):
         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()

ddtrace/contrib/django/db.py

@@ -5,7 +5,6 @@
 
 # project
 from ...ext import sql as sqlx
-from ...ext import AppTypes
 
 from .conf import settings
 from ..dbapi import TracedCursor as DbApiTracedCursor
@@ -63,11 +62,6 @@ def cursor():
             'django.db.vendor': vendor,
             'django.db.alias': alias,
         }
-        tracer.set_service_info(
-            service=service,
-            app=prefix,
-            app_type=AppTypes.db,
-        )
 
         pin = Pin(service, tags=tags, tracer=tracer, app=prefix)
         return DbApiTracedCursor(conn._datadog_original_cursor(), pin)

ddtrace/contrib/elasticsearch/transport.py

@@ -6,7 +6,7 @@
 
 from ...utils.deprecation import deprecated
 from ...compat import urlencode
-from ...ext import AppTypes, http, elasticsearch as metadata
+from ...ext import http, elasticsearch as metadata
 
 DEFAULT_SERVICE = 'elasticsearch'
 SPAN_TYPE = 'elasticsearch'
@@ -15,12 +15,6 @@
 @deprecated(message='Use patching instead (see the docs).', version='1.0.0')
 def get_traced_transport(datadog_tracer, datadog_service=DEFAULT_SERVICE):
 
-    datadog_tracer.set_service_info(
-        service=datadog_service,
-        app=SPAN_TYPE,
-        app_type=AppTypes.db,
-    )
-
     class TracedTransport(elasticsearch.Transport):
         """ Extend elasticseach transport layer to allow Datadog
             tracer to catch any performed request.

ddtrace/contrib/falcon/middleware.py

@@ -6,7 +6,6 @@
 
 from ...compat import iteritems
 from ...constants import EVENT_SAMPLE_RATE_KEY
-from ...ext import AppTypes
 from ...settings import config
 
 
@@ -18,13 +17,6 @@ def __init__(self, tracer, service="falcon", distributed_tracing=False):
         self.service = service
         self._distributed_tracing = distributed_tracing
 
-        # configure Falcon service
-        self.tracer.set_service_info(
-            app='falcon',
-            app_type=AppTypes.web,
-            service=service,
-        )
-
     def process_request(self, req, resp):
         if self._distributed_tracing:
             # Falcon uppercases all header names.

ddtrace/contrib/flask/middleware.py

@@ -1,7 +1,7 @@
 import logging
 
 from ... import compat
-from ...ext import http, errors, AppTypes
+from ...ext import http, errors
 from ...propagation.http import HTTPPropagator
 from ...utils.deprecation import deprecated
 
@@ -37,12 +37,6 @@ def __init__(self, app, tracer, service="flask", use_signals=True, distributed_t
             return
         setattr(app, '__dd_instrumentation', True)
 
-        self.app._tracer.set_service_info(
-            service=service,
-            app="flask",
-            app_type=AppTypes.web,
-        )
-
         # Install hooks which time requests.
         self.app.before_request(self._before_request)
         self.app.after_request(self._after_request)

ddtrace/contrib/flask_cache/tracers.py

@@ -7,7 +7,6 @@
 
 # project
 from .utils import _extract_conn_tags, _resource_from_cache_prefix
-from ...ext import AppTypes
 
 # 3rd party
 from flask.ext.cache import Cache
@@ -29,13 +28,6 @@ def get_traced_cache(ddtracer, service=DEFAULT_SERVICE, meta=None):
     Return a traced Cache object that behaves exactly as the ``flask.ext.cache.Cache class``
     """
 
-    # set the Tracer info
-    ddtracer.set_service_info(
-        app="flask",
-        app_type=AppTypes.cache,
-        service=service,
-    )
-
     class TracedCache(Cache):
         """
         Traced cache backend that monitors any operations done by flask_cache. Observed actions are:

ddtrace/contrib/mongoengine/trace.py

@@ -4,7 +4,7 @@
 
 # project
 import ddtrace
-from ddtrace.ext import AppTypes, mongo as mongox
+from ddtrace.ext import mongo as mongox
 from ddtrace.contrib.pymongo.client import TracedMongoClient
 
 
@@ -26,12 +26,6 @@ def __call__(self, *args, **kwargs):
             # mongoengine uses pymongo internally, so we can just piggyback on the
             # existing pymongo integration and make sure that the connections it
             # uses internally are traced.
-
-            pin.tracer.set_service_info(
-                service=pin.service,
-                app=mongox.TYPE,
-                app_type=AppTypes.db,
-            )
             client = TracedMongoClient(client)
             ddtrace.Pin(service=pin.service, tracer=pin.tracer).onto(client)