remove old defaults.py and move still-used variables to constants.py (#110)

closes #110

Author: beniwohli

elasticapm/base.py

@@ -22,7 +22,7 @@
 import zlib
 
 import elasticapm
-from elasticapm.conf import Config, defaults
+from elasticapm.conf import Config, constants
 from elasticapm.traces import TransactionsStore, get_transaction
 from elasticapm.transport.base import TransportException
 from elasticapm.utils import json_encoder as json
@@ -226,7 +226,7 @@ def build_msg_for_logging(self, event_type, data=None, date=None,
         data = transform(data)
 
         data.update({
-            'timestamp': date.strftime(defaults.TIMESTAMP_FORMAT),
+            'timestamp': date.strftime(constants.TIMESTAMP_FORMAT),
         })
 
         return self.build_msg({'errors': [data]})
@@ -285,7 +285,7 @@ def capture(self, event_type, data=None, date=None,
         data = self.build_msg_for_logging(event_type, data, date, extra, stack, **kwargs)
 
         if data:
-            url = self.config.server_url + defaults.ERROR_API_PATH
+            url = self.config.server_url + constants.ERROR_API_PATH
             self.send(url, **data)
             return data['errors'][0]['id']
 
@@ -493,7 +493,7 @@ def _collect_transactions(self):
             'transactions': transactions,
         })
 
-        api_path = defaults.TRANSACTIONS_API_PATH
+        api_path = constants.TRANSACTIONS_API_PATH
 
         self.send(self.config.server_url + api_path, **data)
         self._start_send_timer()

elasticapm/conf/constants.py

@@ -0,0 +1,7 @@
+# Error API path
+ERROR_API_PATH = '/v1/errors'
+
+# Transactions API path
+TRANSACTIONS_API_PATH = '/v1/transactions'
+
+TIMESTAMP_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'

elasticapm/conf/defaults.py

@@ -6,7 +6,7 @@
 import time
 import uuid
 
-from elasticapm.conf import defaults
+from elasticapm.conf import constants
 from elasticapm.utils import compat, get_name_from_func
 from elasticapm.utils.lru import LRUCache
 
@@ -101,7 +101,7 @@ def to_dict(self):
             'type': self.kind,
             'duration': self.duration * 1000,  # milliseconds
             'result': str(self.result),
-            'timestamp': self.timestamp.strftime(defaults.TIMESTAMP_FORMAT),
+            'timestamp': self.timestamp.strftime(constants.TIMESTAMP_FORMAT),
             'context': self._context,
             'traces': [
                 trace_obj.to_dict() for trace_obj in self.traces

elasticapm/traces.py

@@ -2,8 +2,6 @@
 
 import aiohttp
 
-from elasticapm.conf import defaults
-
 from .base import TransportException
 from .http_base import HTTPTransportBase
 
@@ -21,8 +19,6 @@ def __init__(self, parsed_url):
     async def send(self, data, headers, timeout=None):
         """Use synchronous interface, because this is a coroutine."""
 
-        if timeout is None:
-            timeout = defaults.TIMEOUT
         try:
             with aiohttp.Timeout(timeout):
                 async with self.client.post(self._url,
@@ -32,7 +28,7 @@ async def send(self, data, headers, timeout=None):
         except asyncio.TimeoutError as e:
             print_trace = True
             message = ("Connection to APM Server timed out "
-                       "(url: %s, timeout: %d seconds)" % (self._url, timeout))
+                       "(url: %s, timeout: %s seconds)" % (self._url, timeout))
             raise TransportException(message, data,
                                      print_trace=print_trace) from e
         except AssertionError as e:

elasticapm/transport/asyncio.py

@@ -6,7 +6,6 @@
 import urllib3
 from urllib3.exceptions import MaxRetryError, TimeoutError
 
-from elasticapm.conf import defaults
 from elasticapm.transport.base import TransportException
 from elasticapm.transport.http_base import (AsyncHTTPTransportBase,
                                             HTTPTransportBase)
@@ -33,8 +32,6 @@ def __init__(self, parsed_url):
         super(Transport, self).__init__(parsed_url)
 
     def send(self, data, headers, timeout=None):
-        if timeout is None:
-            timeout = defaults.TIMEOUT
         response = None
 
         # ensure headers are byte strings
@@ -56,7 +53,7 @@ def send(self, data, headers, timeout=None):
                 if isinstance(e, MaxRetryError) and isinstance(e.reason, TimeoutError):
                     message = (
                         "Connection to APM Server timed out "
-                        "(url: %s, timeout: %d seconds)" % (self._url, timeout)
+                        "(url: %s, timeout: %s seconds)" % (self._url, timeout)
                     )
                     print_trace = False
                 else:

elasticapm/transport/http.py

@@ -30,7 +30,7 @@ def test_timeout():
     responses.add('POST', '/', status=202,
                   body=MaxRetryError(None, None, reason=TimeoutError()))
     with pytest.raises(TransportException) as exc_info:
-        transport.send('x', {})
+        transport.send('x', {}, timeout=5)
     assert 'timeout' in str(exc_info.value)