Merge pull request #735 from DataDog/kyle-verhoog/services-workaround

[core] Make writing services a no-op

Author: Kyle-Verhoog

ddtrace/writer.py

@@ -40,9 +40,6 @@ def write(self, spans=None, services=None):
         if spans:
             self._traces.add(spans)
 
-        if services:
-            self._services.add(services)
-
     def _reset_worker(self):
         # if this queue was created in a different process (i.e. this was
         # forked) reset everything so that we can safely work from it.

tests/test_integration.py

@@ -160,12 +160,7 @@ def test_worker_single_service(self):
 
         # expect a call for traces and services
         self._wait_thread_flush()
-        eq_(self.api._put.call_count, 2)
-        # check and retrieve the right call
-        endpoint, payload = self._get_endpoint_payload(self.api._put.call_args_list, '/v0.3/services')
-        eq_(endpoint, '/v0.3/services')
-        eq_(len(payload.keys()), 1)
-        eq_(payload['client.service'], {'app': 'django', 'app_type': 'web'})
+        eq_(self.api._put.call_count, 1)
 
     def test_worker_service_called_multiple_times(self):
         # service must be sent correctly
@@ -176,13 +171,7 @@ def test_worker_service_called_multiple_times(self):
 
         # expect a call for traces and services
         self._wait_thread_flush()
-        eq_(self.api._put.call_count, 2)
-        # check and retrieve the right call
-        endpoint, payload = self._get_endpoint_payload(self.api._put.call_args_list, '/v0.3/services')
-        eq_(endpoint, '/v0.3/services')
-        eq_(len(payload.keys()), 2)
-        eq_(payload['backend'], {'app': 'django', 'app_type': 'web'})
-        eq_(payload['database'], {'app': 'postgres', 'app_type': 'db'})
+        eq_(self.api._put.call_count, 1)
 
     def test_worker_http_error_logging(self):
         # Tests the logging http error logic