Merge pull request #27 from signalfx/lambda_fix

Remove trailing slashes from endpoint url

Author: sm7x

README.rst

@@ -40,7 +40,7 @@ Environment Variables
 
     # endpoint for both metrics and tracer. Overridden by SIGNALFX_METRICS_URL
     # and SIGNALFX_TRACING_URL if set
-    SIGNALFX_ENDPOINT_URL=endpoint url
+    SIGNALFX_ENDPOINT_URL=http://<my_gateway>:8080
 
     # optional metrics and tracing configuration
 
@@ -60,7 +60,7 @@ For example, if only SIGNALFX_ENDPOINT_URL is set:
 
 ::
 
-    SIGNALFX_ENDPOINT_URL=<gateway_address>
+    SIGNALFX_ENDPOINT_URL=http://<my_gateway>:8080
 
 both metrics and traces will be sent to the gateway address.
 
@@ -70,7 +70,7 @@ If SIGNALFX_ENDPOINT_URL and SIGNALFX_METRICS_URL are set:
 
     SIGNALFX_METRICS_URL=https://pops.signalfx.com
 
-    SIGNALFX_ENDPOINT_URL=<gateway_address>
+    SIGNALFX_ENDPOINT_URL=http://<my_gateway>:8080
 
 Traces will be sent to the gateway and metrics will go through POPS.
 

requirements.txt

@@ -1,2 +1,3 @@
 signalfx>=1.0.16
 sfx-jaeger-client>=3.13.1.dev0
+six>=1.4.0

signalfx_lambda/utils.py

@@ -1,5 +1,6 @@
 import os
 import warnings
+import six.moves.urllib.parse as urlparse
 
 from .version import name, version
 
@@ -60,17 +61,11 @@ def get_metrics_url():
 
 def get_tracing_url():
     url = os.environ.get('SIGNALFX_TRACING_URL')
+    if url:
+        return url
 
-    if not url:
-        url = os.environ.get('SIGNALFX_ENDPOINT_URL')
-
-        if url:
-            # if the common endpoint url is used, we need to append the trace path
-            url = url + '/v1/trace'
-        else:
-            url = 'https://ingest.signalfx.com/v1/trace'
-
-    return url
+    url = os.environ.get('SIGNALFX_ENDPOINT_URL', 'https://ingest.signalfx.com')
+    return urlparse.urljoin(url, '/v1/trace')
 
 
 def get_access_token():