Skip to content

Commit 832ae1b

Browse files
committed
fixed trigger tags and tests
1 parent c23911d commit 832ae1b

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

datadog_lambda/tracing.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,10 @@ def extract_context_from_step_functions(event, lambda_context):
403403

404404
if dd_data and dd_data.get("serverless-version") == "v2":
405405
if "x-datadog-trace-id" in dd_data: # lambda root
406-
trace_id = dd_data.get("x-datadog-trace-id")
407-
high_64_bit_trace_id = _parse_high_64_bits(dd_data.get("x-datadog-tags"))
406+
trace_id = int(dd_data.get("x-datadog-trace-id"))
407+
high_64_bit_trace_id = _parse_high_64_bits(
408+
dd_data.get("x-datadog-tags")
409+
)
408410
if high_64_bit_trace_id:
409411
meta["_dd.p.tid"] = high_64_bit_trace_id
410412
else: # sfn root
@@ -709,7 +711,6 @@ def create_inferred_span(
709711
event_source: _EventSource = None,
710712
decode_authorizer_context: bool = True,
711713
):
712-
logger.debug("abhinav event %s", event)
713714
if event_source is None:
714715
event_source = parse_event_source(event)
715716
try:

datadog_lambda/trigger.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,14 @@ def parse_event_source_arn(source: _EventSource, event: dict, context: Any) -> s
256256
if source.event_type == EventTypes.CLOUDWATCH_EVENTS and event.get("resources"):
257257
return event.get("resources")[0]
258258

259+
# todo: testme
260+
# e.g. arn:aws:states:us-east-1:123456789012:stateMachine:stateMachineName
261+
if source.event_type == EventTypes.STEPFUNCTIONS:
262+
context = event
263+
if "_datadog" in event:
264+
context = event.get("_datadog")
265+
return context.get("StateMachine").get("Id")
266+
259267

260268
def get_event_source_arn(source: _EventSource, event: dict, context: Any) -> str:
261269
event_source_arn = event.get("eventSourceARN") or event.get("eventSourceArn")

0 commit comments

Comments
 (0)