Skip to content

Commit 93bb921

Browse files
florentinlflorentinl
authored
Merge branch 'main' into florentinl/system-tests
2 parents b0a1254 + b55e538 commit 93bb921

17 files changed

Lines changed: 55 additions & 8 deletions

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN pip install --no-cache-dir . -t ./python/lib/$runtime/site-packages
3131
RUN rm -rf ./python/lib/$runtime/site-packages/botocore*
3232
RUN rm -rf ./python/lib/$runtime/site-packages/setuptools
3333
RUN rm -rf ./python/lib/$runtime/site-packages/jsonschema/tests
34+
RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/appsec/_iast/_ast/iastpatch*.so
3435
RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/appsec/_iast/_taint_tracking/*.so
3536
RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/appsec/_iast/_stacktrace*.so
3637
# _stack_v2 may not exist for some versions of ddtrace (e.g. under python 3.13)

‎datadog_lambda/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
"DD_APPSEC_ENABLED", "false"
99
)
1010

11-
if os.environ.get("DD_API_SECURITY_ENABLED") is None:
12-
os.environ["DD_API_SECURITY_ENABLED"] = "False"
1311

1412
initialize_cold_start_tracing()
1513

‎datadog_lambda/trigger.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ def extract_http_tags(event):
288288
"""
289289
Extracts HTTP facet tags from the triggering event
290290
"""
291-
http_tags = {}
291+
http_tags = {"span.kind": "server"}
292292

293293
# Safely get request_context and ensure it's a dictionary
294294
request_context = event.get("requestContext")

‎scripts/check_layer_size.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
set -e
1111
MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 17 \* 1024 / 2) # 8704 KB
12-
MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 23 \* 1024) # 23552 KB
12+
MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 22 \* 1024) # 22528 KB
1313

1414

1515
LAYER_FILES_PREFIX="datadog_lambda_py"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
104104
"span.name": "aws.lambda",
105105
"function_trigger.event_source": "api-gateway",
106106
"function_trigger.event_source_arn": "XXXX",
107+
"span.kind": "server",
107108
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
108109
"http.url_details.path": "/Prod/",
109110
"http.method": "GET",
@@ -642,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
642643
"span.name": "aws.lambda",
643644
"function_trigger.event_source": "api-gateway",
644645
"function_trigger.event_source_arn": "XXXX$default",
646+
"span.kind": "server",
645647
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
646648
"http.url_details.path": "/httpapi/get",
647649
"http.method": "GET",
@@ -1479,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
14791481
"span.name": "aws.lambda",
14801482
"function_trigger.event_source": "api-gateway",
14811483
"function_trigger.event_source_arn": "XXXX",
1484+
"span.kind": "server",
14821485
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
14831486
"http.status_code": "200"
14841487
},

‎tests/integration/snapshots/logs/async-metrics_python311.log‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
104104
"span.name": "aws.lambda",
105105
"function_trigger.event_source": "api-gateway",
106106
"function_trigger.event_source_arn": "XXXX",
107+
"span.kind": "server",
107108
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
108109
"http.url_details.path": "/Prod/",
109110
"http.method": "GET",
@@ -642,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
642643
"span.name": "aws.lambda",
643644
"function_trigger.event_source": "api-gateway",
644645
"function_trigger.event_source_arn": "XXXX$default",
646+
"span.kind": "server",
645647
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
646648
"http.url_details.path": "/httpapi/get",
647649
"http.method": "GET",
@@ -1479,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
14791481
"span.name": "aws.lambda",
14801482
"function_trigger.event_source": "api-gateway",
14811483
"function_trigger.event_source_arn": "XXXX",
1484+
"span.kind": "server",
14821485
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
14831486
"http.status_code": "200"
14841487
},

‎tests/integration/snapshots/logs/async-metrics_python312.log‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
104104
"span.name": "aws.lambda",
105105
"function_trigger.event_source": "api-gateway",
106106
"function_trigger.event_source_arn": "XXXX",
107+
"span.kind": "server",
107108
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
108109
"http.url_details.path": "/Prod/",
109110
"http.method": "GET",
@@ -642,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
642643
"span.name": "aws.lambda",
643644
"function_trigger.event_source": "api-gateway",
644645
"function_trigger.event_source_arn": "XXXX$default",
646+
"span.kind": "server",
645647
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
646648
"http.url_details.path": "/httpapi/get",
647649
"http.method": "GET",
@@ -1479,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
14791481
"span.name": "aws.lambda",
14801482
"function_trigger.event_source": "api-gateway",
14811483
"function_trigger.event_source_arn": "XXXX",
1484+
"span.kind": "server",
14821485
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
14831486
"http.status_code": "200"
14841487
},

‎tests/integration/snapshots/logs/async-metrics_python313.log‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
104104
"span.name": "aws.lambda",
105105
"function_trigger.event_source": "api-gateway",
106106
"function_trigger.event_source_arn": "XXXX",
107+
"span.kind": "server",
107108
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
108109
"http.url_details.path": "/Prod/",
109110
"http.method": "GET",
@@ -642,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
642643
"span.name": "aws.lambda",
643644
"function_trigger.event_source": "api-gateway",
644645
"function_trigger.event_source_arn": "XXXX$default",
646+
"span.kind": "server",
645647
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
646648
"http.url_details.path": "/httpapi/get",
647649
"http.method": "GET",
@@ -1479,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
14791481
"span.name": "aws.lambda",
14801482
"function_trigger.event_source": "api-gateway",
14811483
"function_trigger.event_source_arn": "XXXX",
1484+
"span.kind": "server",
14821485
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
14831486
"http.status_code": "200"
14841487
},

‎tests/integration/snapshots/logs/async-metrics_python38.log‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
104104
"span.name": "aws.lambda",
105105
"function_trigger.event_source": "api-gateway",
106106
"function_trigger.event_source_arn": "XXXX",
107+
"span.kind": "server",
107108
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
108109
"http.url_details.path": "/Prod/",
109110
"http.method": "GET",
@@ -642,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
642643
"span.name": "aws.lambda",
643644
"function_trigger.event_source": "api-gateway",
644645
"function_trigger.event_source_arn": "XXXX$default",
646+
"span.kind": "server",
645647
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
646648
"http.url_details.path": "/httpapi/get",
647649
"http.method": "GET",
@@ -1479,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
14791481
"span.name": "aws.lambda",
14801482
"function_trigger.event_source": "api-gateway",
14811483
"function_trigger.event_source_arn": "XXXX",
1484+
"span.kind": "server",
14821485
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
14831486
"http.status_code": "200"
14841487
},

‎tests/integration/snapshots/logs/async-metrics_python39.log‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
104104
"span.name": "aws.lambda",
105105
"function_trigger.event_source": "api-gateway",
106106
"function_trigger.event_source_arn": "XXXX",
107+
"span.kind": "server",
107108
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com",
108109
"http.url_details.path": "/Prod/",
109110
"http.method": "GET",
@@ -642,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
642643
"span.name": "aws.lambda",
643644
"function_trigger.event_source": "api-gateway",
644645
"function_trigger.event_source_arn": "XXXX$default",
646+
"span.kind": "server",
645647
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
646648
"http.url_details.path": "/httpapi/get",
647649
"http.method": "GET",
@@ -1479,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
14791481
"span.name": "aws.lambda",
14801482
"function_trigger.event_source": "api-gateway",
14811483
"function_trigger.event_source_arn": "XXXX",
1484+
"span.kind": "server",
14821485
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
14831486
"http.status_code": "200"
14841487
},

0 commit comments

Comments
 (0)