remove xray

Author: maxday

LICENSE-3rdparty.csv

@@ -1,6 +1,4 @@
 Component,Origin,License,Copyright
-aws-xray-sdk-python,github.com/aws/aws-xray-sdk-python,Apache-2.0,
 flake8,gitlab.com/pycqa/flake8,MIT,"Copyright (C) 2011-2013 Tarek Ziade <[email protected]>. Copyright (C) 2012-2016 Ian Cordasco <[email protected]>."
 nose2,github.com/nose-devs/nose2,BSD-2-Clause,"Copyright (c) 2012, Jason Pellerin. All rights reserved."
-requests,github.com/kennethreitz/requests,Apache-2.0,"Copyright 2018 Kenneth Reitz"
 wrapt,github.com/GrahamDumpleton/wrapt,BSD-2-Clause,"Copyright (c) 2013-2019, Graham Dumpleton"

datadog_lambda/constants.py

@@ -34,3 +34,7 @@ class TraceContextSource(object):
     XRAY = "xray"
     EVENT = "event"
     DDTRACE = "ddtrace"
+
+
+XRAY_TRACE_ID_HEADER_NAME = "_X_AMZN_TRACE_ID"
+FUNCTION_NAME_HEADER_NAME = "AWS_LAMBDA_FUNCTION_NAME"

datadog_lambda/tracing.py

@@ -7,13 +7,12 @@
 import os
 import json
 
-from aws_xray_sdk.core import xray_recorder
-from aws_xray_sdk.core.lambda_launcher import LambdaContext
 from datadog_lambda.constants import (
     SamplingPriority,
     TraceHeader,
     XraySubsegment,
     TraceContextSource,
+    XRAY_TRACE_ID_HEADER_NAME
 )
 from ddtrace import tracer, patch
 from ddtrace import __version__ as ddtrace_version
@@ -54,19 +53,18 @@ def _convert_xray_sampling(xray_sampled):
 
 
 def _get_xray_trace_context():
-    if not is_lambda_context():
+    xray_trace_entity = _get_context_from_raw_xray_trace_id(os.environ.get(XRAY_TRACE_ID_HEADER_NAME,""))
+    if xray_trace_entity is None:
         return None
-
-    xray_trace_entity = xray_recorder.get_trace_entity()  # xray (sub)segment
     trace_context = {
-        "trace-id": _convert_xray_trace_id(xray_trace_entity.trace_id),
-        "parent-id": _convert_xray_entity_id(xray_trace_entity.id),
-        "sampling-priority": _convert_xray_sampling(xray_trace_entity.sampled),
+        "trace-id": _convert_xray_trace_id(xray_trace_entity.get("trace_id")),
+        "parent-id": _convert_xray_entity_id(xray_trace_entity.get("id")),
+        "sampling-priority": _convert_xray_sampling(xray_trace_entity.get("sampled")),
     }
     logger.debug(
         "Converted trace context %s from X-Ray segment %s",
         trace_context,
-        (xray_trace_entity.trace_id, xray_trace_entity.id, xray_trace_entity.sampled),
+        (xray_trace_entity.get("trace_id"), xray_trace_entity.get("id"), xray_trace_entity.get("sampled")),
     )
     return trace_context
 
@@ -97,29 +95,28 @@ def _context_obj_to_headers(obj):
         TraceHeader.SAMPLING_PRIORITY: str(obj.get("sampling-priority")),
     }
 
-
-def create_dd_dummy_metadata_subsegment(
-    subsegment_metadata_value, subsegment_metadata_key
-):
-    """
-    Create a Datadog subsegment to pass the Datadog trace context or Lambda function
-    tags into its metadata field, so the X-Ray trace can be converted to a Datadog
-    trace in the Datadog backend with the correct context.
-    """
-    try:
-        xray_recorder.begin_subsegment(XraySubsegment.NAME)
-        subsegment = xray_recorder.current_subsegment()
-        subsegment.put_metadata(
-            subsegment_metadata_key, subsegment_metadata_value, XraySubsegment.NAMESPACE
-        )
-        xray_recorder.end_subsegment()
-    except Exception as e:
-        logger.debug(
-            "failed to create dd dummy metadata subsegment with error %s",
-            e,
-            exc_info=True,
-        )
-
+def _get_context_from_raw_xray_trace_id(raw_trace_id):
+    #example : Root=1-5e272390-8c398be037738dc042009320;Parent=94ae789b969f1cc5;Sampled=1
+    if len(raw_trace_id) == 0:
+        return None
+    parts = raw_trace_id.split(";")
+    if len(parts) != 3:
+        return None
+    root = parts[0].replace("Root=", "")
+    parent = parts[1].replace("Parent=", "")
+    sampled = parts[2].replace("Sampled=", "")
+    if len(root) == len(parts[0]) or len(parent) == len(parts[1]) or len(sampled) == len(parts[2]):
+        return None
+    print({
+        "id": parent,
+        "trace_id": root,
+        "sampled": sampled,
+    })
+    return {
+        "id": parent,
+        "trace_id": root,
+        "sampled": sampled,
+    }
 
 def extract_context_from_lambda_context(lambda_context):
     """
@@ -301,6 +298,7 @@ def get_dd_trace_context():
     return _context_obj_to_headers(context) if context is not None else {}
 
 
+
 def set_correlation_ids():
     """
     Create a dummy span, and overrides its trace_id and span_id, to make
@@ -353,14 +351,8 @@ def inject_correlation_ids():
 
     logger.debug("logs injection configured")
 
-
 def is_lambda_context():
-    """
-    Return True if the X-Ray context is `LambdaContext`, rather than the
-    regular `Context` (e.g., when testing lambda functions locally).
-    """
-    return type(xray_recorder.context) == LambdaContext
-
+    return os.environ.get("FUNCTION_NAME_HEADER_NAME", "") != ""
 
 def set_dd_trace_py_root(trace_context_source, merge_xray_traces):
     if trace_context_source == TraceContextSource.EVENT or merge_xray_traces:

datadog_lambda/wrapper.py

@@ -10,7 +10,6 @@
 
 from datadog_lambda.extension import should_use_extension, flush_extension
 from datadog_lambda.cold_start import set_cold_start, is_cold_start
-from datadog_lambda.constants import XraySubsegment, TraceContextSource
 from datadog_lambda.metric import (
     flush_stats,
     submit_invocations_metric,
@@ -20,7 +19,6 @@
 from datadog_lambda.patch import patch_all
 from datadog_lambda.tracing import (
     extract_dd_trace_context,
-    create_dd_dummy_metadata_subsegment,
     inject_correlation_ids,
     dd_tracing_enabled,
     set_correlation_ids,
@@ -140,11 +138,6 @@ def _before(self, event, context):
             dd_context, trace_context_source = extract_dd_trace_context(
                 event, context, extractor=self.trace_extractor
             )
-            # Create a Datadog X-Ray subsegment with the trace context
-            if dd_context and trace_context_source == TraceContextSource.EVENT:
-                create_dd_dummy_metadata_subsegment(
-                    dd_context, XraySubsegment.TRACE_KEY
-                )
 
             if dd_tracing_enabled:
                 set_dd_trace_py_root(trace_context_source, self.merge_xray_traces)
@@ -168,12 +161,6 @@ def _after(self, event, context):
             status_code = extract_http_status_code_tag(self.trigger_tags, self.response)
             if status_code:
                 self.trigger_tags["http.status_code"] = status_code
-            # Create a new dummy Datadog subsegment for function trigger tags so we
-            # can attach them to X-Ray spans when hybrid tracing is used
-            if self.trigger_tags:
-                create_dd_dummy_metadata_subsegment(
-                    self.trigger_tags, XraySubsegment.LAMBDA_FUNCTION_TAGS_KEY
-                )
 
             if not self.flush_to_log or should_use_extension:
                 flush_stats()

setup.py

@@ -29,7 +29,6 @@
     packages=["datadog_lambda"],
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4",
     install_requires=[
-        "aws-xray-sdk==2.8.0",
         "datadog==0.41.0",
         "ddtrace==0.48.0",
         "wrapt==1.11.2",