Skip to content

Commit 5d04656

Browse files
Checking for request header field without raising exception
1 parent 07ead6d commit 5d04656

File tree

2 files changed

+55
-1
lines changed

2 files changed

+55
-1
lines changed

datadog_lambda/tracing.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,13 +629,15 @@ def extract_dd_trace_context(
629629
context = extract_context_custom_extractor(extractor, event, lambda_context)
630630
elif isinstance(event, (set, dict)) and "request" in event:
631631
request = event.get("request")
632-
if "headers" in request:
632+
if isinstance(request, (set, dict)) and "headers" in request:
633633
context = extract_context_from_http_event_or_context(
634634
request,
635635
lambda_context,
636636
event_source,
637637
decode_authorizer_context=False,
638638
)
639+
else:
640+
context = extract_context_from_lambda_context(lambda_context)
639641
elif isinstance(event, (set, dict)) and "headers" in event:
640642
context = extract_context_from_http_event_or_context(
641643
event, lambda_context, event_source, decode_authorizer_context
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"identity": "None",
3+
"info": {
4+
"fieldName": "getItems",
5+
"parentTypeName": "Query",
6+
"selectionSetGraphQL": "{\n id\n}",
7+
"selectionSetList":["id"]
8+
},
9+
"prev": "None",
10+
"request": "hi",
11+
"headers": {
12+
"accept": "*/*",
13+
"accept-encoding": "gzip, deflate, br, zstd",
14+
"accept-language": "en-US,en;q=0.9",
15+
"cloudfront-forwarded-proto": "https",
16+
"cloudfront-is-desktop-viewer": "True",
17+
"cloudfront-is-mobile-viewer": "False",
18+
"cloudfront-is-smarttv-viewer":"False",
19+
"cloudfront-is-tablet-viewer":" False",
20+
"cloudfront-viewer-asn": "6461",
21+
"cloudfront-viewer-country": "US",
22+
"content-length": "47",
23+
"content-type": "application/graphql",
24+
"host": "4aowrg2uhvbw5mn7osu6searqi.appsync-api.us-east-1.amazonaws.com",
25+
"origin": "http://localhost:5173",
26+
"priority": "u=1, i",
27+
"referer": "http://localhost:5173/",
28+
"sec-ch-ua": "\"Chromium\";v=\"140\", \"Not=A?Brand\";v=\"24\", \"Google Chrome\";v=\"140\"",
29+
"sec-ch-ua-mobile": "?0",
30+
"sec-ch-ua-platform": "macOS",
31+
"sec-fetch-dest": "empty",
32+
"sec-fetch-mode": "cors",
33+
"sec-fetch-site": "cross-site",
34+
"traceparent": "00-0000000000000000d9f454c80b9a529a-73ac6ca3427073a3-01",
35+
"tracestate": "dd=s:1;o:rum",
36+
"user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36","via":"2.0 62f9f3967e93a923f21c8acb20cf10b6.cloudfront.net (CloudFront)",
37+
"x-amz-cf-id": "Femhicb_Vbva-J8qWjdI4hKMmqusCeQSp207UGyY3u8VOUrdE8BBvg==",
38+
"x-amzn-appsync-is-vpce-request": "False",
39+
"x-amzn-remote-ip": "64.124.12.19",
40+
"x-amzn-requestid": "1ee1669a-eda3-4d4f-911c-35f74ebef31d",
41+
"x-amzn-trace-id": "Root=1-68cdb7e9-438bf88259d7ce3535723bdd",
42+
"x-datadog-origin": "rum",
43+
"x-datadog-parent-id": "67890",
44+
"x-datadog-sampling-priority": "1",
45+
"x-datadog-trace-id": "12345",
46+
"x-forwarded-for": "64.124.12.19,15.158.225.229",
47+
"x-forwarded-port": "443",
48+
"x-forwarded-proto": "https"
49+
50+
},
51+
"source": "None"
52+
}

0 commit comments

Comments
 (0)