Skip to content

Commit 31e113c

Browse files
emmettbutleremmettbutler
authored
Merge branch 'main' into emmett.butler/serverless-wheels-3
2 parents e38dffb + db826eb commit 31e113c

File tree

9 files changed

+143
-161
lines changed

9 files changed

+143
-161
lines changed

‎datadog_lambda/wrapper.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ def __call__(self, event, context, **kwargs):
191191
if self.blocking_response:
192192
return self.blocking_response
193193
self.response = self.func(event, context, **kwargs)
194+
return self.response
194195
except BlockingException:
195196
self.blocking_response = get_asm_blocked_response(self.event_source)
196197
except Exception:
@@ -203,10 +204,8 @@ def __call__(self, event, context, **kwargs):
203204
raise
204205
finally:
205206
self._after(event, context)
206-
207-
if self.blocking_response:
208-
return self.blocking_response
209-
return self.response
207+
if self.blocking_response:
208+
return self.blocking_response
210209

211210
def _inject_authorizer_span_headers(self, request_id):
212211
reference_span = self.inferred_span if self.inferred_span else self.span

‎tests/integration/snapshots/logs/sync-metrics_python310.log‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
7575
"duration": "XXXX",
7676
"meta": {
7777
"_dd.origin": "lambda",
78-
"span.kind": "server",
7978
"cold_start": "true",
8079
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
8180
"function_version": "$LATEST",
@@ -87,6 +86,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
8786
"span.name": "aws.lambda",
8887
"function_trigger.event_source": "api-gateway",
8988
"function_trigger.event_source_arn": "XXXX",
89+
"span.kind": "server",
9090
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/Prod/",
9191
"http.method": "GET",
9292
"http.route": "/",
@@ -174,7 +174,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
174174
"http.method": "POST",
175175
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
176176
"out.host": "api.datadoghq.com",
177-
"http.status_code": "403",
177+
"http.status_code": "202",
178178
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
179179
"_dd.p.dm": "-0",
180180
"_dd.p.tid": "XXXX",
@@ -227,7 +227,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
227227
"meta": {
228228
"runtime-id": "XXXX",
229229
"_dd.origin": "lambda",
230-
"span.kind": "server",
231230
"cold_start": "false",
232231
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
233232
"function_version": "$LATEST",
@@ -237,6 +236,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
237236
"datadog_lambda": "X.X.X",
238237
"dd_trace": "X.X.X",
239238
"span.name": "aws.lambda",
239+
"span.kind": "server",
240240
"language": "python"
241241
},
242242
"metrics": {
@@ -322,7 +322,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
322322
"http.method": "POST",
323323
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
324324
"out.host": "api.datadoghq.com",
325-
"http.status_code": "403",
325+
"http.status_code": "202",
326326
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
327327
"_dd.p.dm": "-0",
328328
"_dd.p.tid": "XXXX",
@@ -455,7 +455,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
455455
"duration": "XXXX",
456456
"meta": {
457457
"_dd.origin": "lambda",
458-
"span.kind": "server",
459458
"cold_start": "false",
460459
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
461460
"function_version": "$LATEST",
@@ -465,6 +464,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
465464
"datadog_lambda": "X.X.X",
466465
"dd_trace": "X.X.X",
467466
"span.name": "aws.lambda",
467+
"span.kind": "server",
468468
"function_trigger.event_source": "dynamodb",
469469
"function_trigger.event_source_arn": "XXXX"
470470
},
@@ -550,7 +550,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
550550
"http.method": "POST",
551551
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
552552
"out.host": "api.datadoghq.com",
553-
"http.status_code": "403",
553+
"http.status_code": "202",
554554
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
555555
"_dd.p.dm": "-0",
556556
"_dd.p.tid": "XXXX",
@@ -635,7 +635,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
635635
"duration": "XXXX",
636636
"meta": {
637637
"_dd.origin": "lambda",
638-
"span.kind": "server",
639638
"cold_start": "false",
640639
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
641640
"function_version": "$LATEST",
@@ -645,6 +644,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
645644
"datadog_lambda": "X.X.X",
646645
"dd_trace": "X.X.X",
647646
"span.name": "aws.lambda",
647+
"span.kind": "server",
648648
"function_trigger.event_source": "eventbridge"
649649
},
650650
"metrics": {
@@ -729,7 +729,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
729729
"http.method": "POST",
730730
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
731731
"out.host": "api.datadoghq.com",
732-
"http.status_code": "403",
732+
"http.status_code": "202",
733733
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
734734
"_dd.p.dm": "-0",
735735
"_dd.p.tid": "XXXX",
@@ -824,7 +824,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
824824
"duration": "XXXX",
825825
"meta": {
826826
"_dd.origin": "lambda",
827-
"span.kind": "server",
828827
"cold_start": "false",
829828
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
830829
"function_version": "$LATEST",
@@ -836,6 +835,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
836835
"span.name": "aws.lambda",
837836
"function_trigger.event_source": "api-gateway",
838837
"function_trigger.event_source_arn": "XXXX$default",
838+
"span.kind": "server",
839839
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
840840
"http.method": "GET",
841841
"http.route": "/httpapi/get",
@@ -923,7 +923,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
923923
"http.method": "POST",
924924
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
925925
"out.host": "api.datadoghq.com",
926-
"http.status_code": "403",
926+
"http.status_code": "202",
927927
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
928928
"_dd.p.dm": "-0",
929929
"_dd.p.tid": "XXXX",
@@ -1015,7 +1015,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
10151015
"duration": "XXXX",
10161016
"meta": {
10171017
"_dd.origin": "lambda",
1018-
"span.kind": "server",
10191018
"cold_start": "false",
10201019
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
10211020
"function_version": "$LATEST",
@@ -1025,6 +1024,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
10251024
"datadog_lambda": "X.X.X",
10261025
"dd_trace": "X.X.X",
10271026
"span.name": "aws.lambda",
1027+
"span.kind": "server",
10281028
"function_trigger.event_source": "kinesis",
10291029
"function_trigger.event_source_arn": "XXXX"
10301030
},
@@ -1110,7 +1110,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
11101110
"http.method": "POST",
11111111
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
11121112
"out.host": "api.datadoghq.com",
1113-
"http.status_code": "403",
1113+
"http.status_code": "202",
11141114
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
11151115
"_dd.p.dm": "-0",
11161116
"_dd.p.tid": "XXXX",
@@ -1211,7 +1211,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
12111211
"duration": "XXXX",
12121212
"meta": {
12131213
"_dd.origin": "lambda",
1214-
"span.kind": "server",
12151214
"cold_start": "false",
12161215
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
12171216
"function_version": "$LATEST",
@@ -1221,6 +1220,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
12211220
"datadog_lambda": "X.X.X",
12221221
"dd_trace": "X.X.X",
12231222
"span.name": "aws.lambda",
1223+
"span.kind": "server",
12241224
"function_trigger.event_source": "s3",
12251225
"function_trigger.event_source_arn": "XXXX"
12261226
},
@@ -1306,7 +1306,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
13061306
"http.method": "POST",
13071307
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
13081308
"out.host": "api.datadoghq.com",
1309-
"http.status_code": "403",
1309+
"http.status_code": "202",
13101310
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
13111311
"_dd.p.dm": "-0",
13121312
"_dd.p.tid": "XXXX",
@@ -1396,7 +1396,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
13961396
"duration": "XXXX",
13971397
"meta": {
13981398
"_dd.origin": "lambda",
1399-
"span.kind": "server",
14001399
"cold_start": "false",
14011400
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
14021401
"function_version": "$LATEST",
@@ -1406,6 +1405,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
14061405
"datadog_lambda": "X.X.X",
14071406
"dd_trace": "X.X.X",
14081407
"span.name": "aws.lambda",
1408+
"span.kind": "server",
14091409
"function_trigger.event_source": "sns",
14101410
"function_trigger.event_source_arn": "XXXX"
14111411
},
@@ -1491,7 +1491,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
14911491
"http.method": "POST",
14921492
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
14931493
"out.host": "api.datadoghq.com",
1494-
"http.status_code": "403",
1494+
"http.status_code": "202",
14951495
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
14961496
"_dd.p.dm": "-0",
14971497
"_dd.p.tid": "XXXX",
@@ -1580,7 +1580,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
15801580
"duration": "XXXX",
15811581
"meta": {
15821582
"_dd.origin": "lambda",
1583-
"span.kind": "server",
15841583
"cold_start": "false",
15851584
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
15861585
"function_version": "$LATEST",
@@ -1590,6 +1589,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
15901589
"datadog_lambda": "X.X.X",
15911590
"dd_trace": "X.X.X",
15921591
"span.name": "aws.lambda",
1592+
"span.kind": "server",
15931593
"function_trigger.event_source": "sqs",
15941594
"function_trigger.event_source_arn": "XXXX"
15951595
},
@@ -1675,7 +1675,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
16751675
"http.method": "POST",
16761676
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
16771677
"out.host": "api.datadoghq.com",
1678-
"http.status_code": "403",
1678+
"http.status_code": "202",
16791679
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
16801680
"_dd.p.dm": "-0",
16811681
"_dd.p.tid": "XXXX",
@@ -1770,7 +1770,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
17701770
"duration": "XXXX",
17711771
"meta": {
17721772
"_dd.origin": "lambda",
1773-
"span.kind": "server",
17741773
"cold_start": "false",
17751774
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
17761775
"function_version": "$LATEST",
@@ -1782,6 +1781,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
17821781
"span.name": "aws.lambda",
17831782
"function_trigger.event_source": "api-gateway",
17841783
"function_trigger.event_source_arn": "XXXX",
1784+
"span.kind": "server",
17851785
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
17861786
"http.status_code": "200"
17871787
},
@@ -1867,7 +1867,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
18671867
"http.method": "POST",
18681868
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
18691869
"out.host": "api.datadoghq.com",
1870-
"http.status_code": "403",
1870+
"http.status_code": "202",
18711871
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
18721872
"_dd.p.dm": "-0",
18731873
"_dd.p.tid": "XXXX",

0 commit comments

Comments
 (0)