Merge pull request #3 from tracereq/init-param-change

changing token -> api_key param for init

Author: prateeksachan

README.md

@@ -16,9 +16,8 @@ pip install --upgrade tracereq
 import tracereq
 
 app = Flask(__name__)
-tracereq.init(
-    flask_wsgi_app=app.wsgi_app,
-    token='auth_token'
+tracereq.init(api_key='xxx-xxx',
+    flask_app=app.wsgi_app
 )
 ```
 

tracereq/__init__.py

@@ -10,9 +10,9 @@ def get_core_integrations():
 
 
 def get_custom_integrations(**kwargs):
-    if kwargs.get('flask_wsgi_app'):
+    if kwargs.get('flask_app'):
         from .flasklib import FlasklibIntegration
-        yield FlasklibIntegration(kwargs.get('flask_wsgi_app'))
+        yield FlasklibIntegration(kwargs.get('flask_app'))
 
 
 def setup_integrations(*args, **kwargs):

tracereq/client.py

@@ -5,17 +5,17 @@
 class Client(object):
     def __init__(
             self,
-            token: str = '',
+            api_key: str = '',
             *args,
             **kwargs
     ):
-        self._token = token
+        self._api_key = api_key
         self._dest = DESTINATION_URL
         self._exclude_url_paths = kwargs.get('exclude_url_paths', [])
         self._exclude_urls_regex = kwargs.get('exclude_urls_regex', [])
         self._exclude_functions = kwargs.get('exclude_functions', [])
         self._exclude_sensitive_headers = kwargs.get('exclude_sensitive_headers', SENSITIVE_HEADERS)
-        self._transport = HTTPTransport(self._token, self._dest)
+        self._transport = HTTPTransport(self._api_key, self._dest)
 
     @property
     def transport(self):

tracereq/customlib.py

@@ -23,7 +23,7 @@ def install_httplib(self):
         def custom_putrequest(self, method, url, *args, **kwargs):
             self.engine = Engine.current
             req = original_putrequest(self, method, url, *args, **kwargs)
-            if DESTINATION_URL in self.host:
+            if self.host in DESTINATION_URL:
                 return req
 
             parsed_url = urlsplit(url)
@@ -43,7 +43,7 @@ def custom_putrequest(self, method, url, *args, **kwargs):
 
         def custom_getresponse(self, *args, **kwargs):
             res = original_getresponse(self, *args, **kwargs)
-            if DESTINATION_URL in self.host:
+            if self.host in DESTINATION_URL:
                 return res
 
             self._trace = self.engine.get_trace()

tracereq/transport.py

@@ -26,13 +26,13 @@ def to_json(obj):
 
 
 class HTTPTransport(object):
-    def __init__(self, token, dest):
-        self.token = token
+    def __init__(self, api_key, dest):
+        self.api_key = api_key
         self.dest = dest
         self.timeout = TRANSPORT_SEND_TIMEOUT
         self.session = urllib3.PoolManager(
             headers={
-                'Authorization': 'Bearer {}'.format(self.token),
+                'Authorization': 'Bearer {}'.format(self.api_key),
                 'Content-Type': 'application/json'
             },
             maxsize=5