lint

Author: maxday

datadog_lambda/constants.py

@@ -37,6 +37,6 @@ class TraceContextSource(object):
 
 
 # X-Ray deamon
-class XrayDeamon(object):
-    HOST = "127.0.0.1"
-    PORT = 2000
+class XrayDaemon(object):
+    XRAY_TRACE_ID_HEADER_NAME = "_X_AMZN_TRACE_ID"
+    XRAY_DAEMON_ADDRESS = "AWS_XRAY_DAEMON_ADDRESS"

datadog_lambda/tracing.py

@@ -11,11 +11,11 @@
     SamplingPriority,
     TraceHeader,
     TraceContextSource,
+    XrayDaemon,
 )
 from datadog_lambda.xray import (
     send_segment,
     parse_xray_header,
-    XRAY_TRACE_ID_HEADER_NAME,
 )
 from ddtrace import tracer, patch
 from ddtrace import __version__ as ddtrace_version
@@ -61,7 +61,9 @@ def _get_xray_trace_context():
     if not is_lambda_context():
         return None
 
-    xray_trace_entity = parse_xray_header(os.environ.get(XRAY_TRACE_ID_HEADER_NAME, ""))
+    xray_trace_entity = parse_xray_header(
+        os.environ.get(XrayDaemon.XRAY_TRACE_ID_HEADER_NAME, "")
+    )
     if xray_trace_entity is None:
         return None
     trace_context = {

datadog_lambda/xray.py

@@ -5,10 +5,8 @@
 import time
 import socket
 
-from datadog_lambda.constants import XraySubsegment, TraceContextSource
+from datadog_lambda.constants import XrayDaemon, XraySubsegment, TraceContextSource
 
-XRAY_TRACE_ID_HEADER_NAME = "_X_AMZN_TRACE_ID"
-XRAY_DAEMON_ADDRESS = "AWS_XRAY_DAEMON_ADDRESS"
 logger = logging.getLogger(__name__)
 
 
@@ -98,10 +96,14 @@ def build_segment(context, key, metadata):
 
 
 def send_segment(key, metadata):
-    host_port_tuple = get_xray_host_port(os.environ.get(XRAY_DAEMON_ADDRESS, ""))
+    host_port_tuple = get_xray_host_port(
+        os.environ.get(XrayDaemon.XRAY_DAEMON_ADDRESS, "")
+    )
     if host_port_tuple is None:
         return None
-    context = parse_xray_header(os.environ.get(XRAY_TRACE_ID_HEADER_NAME, ""))
+    context = parse_xray_header(
+        os.environ.get(XrayDaemon.XRAY_TRACE_ID_HEADER_NAME, "")
+    )
     if context is None:
         logger.debug(
             "Failed to create segment since it was not possible to get trace context from header"

tests/test_tracing.py

@@ -58,7 +58,6 @@ def setUp(self):
         global dd_tracing_enabled
         dd_tracing_enabled = False
         os.environ["_X_AMZN_TRACE_ID"] = fake_xray_header_value
-        os.environ["XRAY_DAEMON_ADDRESS"] = "1.1.1.1:8888"
         patcher = patch("datadog_lambda.tracing.send_segment")
         self.mock_send_segment = patcher.start()
         self.addCleanup(patcher.stop)
@@ -71,7 +70,6 @@ def tearDown(self):
         global dd_tracing_enabled
         dd_tracing_enabled = False
         del os.environ["_X_AMZN_TRACE_ID"]
-        del os.environ["XRAY_DAEMON_ADDRESS"]
 
     def test_without_datadog_trace_headers(self):
         lambda_ctx = get_mock_context()