chore: support python 3.13 (#544)

Author: apiarian-datadog

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
       - name: Checkout

CONTRIBUTING.md

@@ -24,7 +24,7 @@ We love pull requests. For new features, consider opening an issue to discuss th
      ./scripts/build_layers.sh
 
      # Publish the a testing layer to your own AWS account, and the ARN will be returned
-     # Example: VERSION=1 REGIONS=us-east-1 LAYERS=Datadog-Python312 ./scripts/publish_layers.sh
+     # Example: VERSION=1 REGIONS=us-east-1 LAYERS=Datadog-Python313 ./scripts/publish_layers.sh
      VERSION=<VERSION> REGIONS=<REGION> LAYERS=<LAYER> ./scripts/publish_layers.sh
      ```
 

Dockerfile

@@ -23,11 +23,11 @@ RUN rm -rf ./python/lib/$runtime/site-packages/setuptools
 RUN rm -rf ./python/lib/$runtime/site-packages/jsonschema/tests
 RUN find . -name 'libddwaf.so' -delete
 # Comment this line out for now since ddtrace now tries to import it
-#RUN rm ./python/lib/$runtime/site-packages/ddtrace/appsec/_iast/_taint_tracking/*.so
-RUN rm ./python/lib/$runtime/site-packages/ddtrace/appsec/_iast/_stacktrace*.so
+# RUN rm ./python/lib/$runtime/site-packages/ddtrace/appsec/_iast/_stacktrace*.so
 RUN rm ./python/lib/$runtime/site-packages/ddtrace/internal/datadog/profiling/libdd_wrapper*.so
 RUN rm ./python/lib/$runtime/site-packages/ddtrace/internal/datadog/profiling/ddup/_ddup.*.so
-RUN rm ./python/lib/$runtime/site-packages/ddtrace/internal/datadog/profiling/stack_v2/_stack_v2.*.so
+# _stack_v2 may not exist for some versions of ddtrace (e.g. under python 3.13)
+RUN rm -f ./python/lib/$runtime/site-packages/ddtrace/internal/datadog/profiling/stack_v2/_stack_v2.*.so
 # remove *.dist-info directories except any entry_points.txt files
 RUN find ./python/lib/$runtime/site-packages/*.dist-info -not -name "entry_points.txt" -type f -delete
 RUN find ./python/lib/$runtime/site-packages -type d -empty -delete

README.md

@@ -6,7 +6,7 @@
 [![Slack](https://chat.datadoghq.com/badge.svg?bg=632CA6)](https://chat.datadoghq.com/)
 [![License](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/DataDog/datadog-lambda-python/blob/main/LICENSE)
 
-Datadog Lambda Library for Python (3.8, 3.9, 3.10, 3.11, and 3.12) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
+Datadog Lambda Library for Python (3.8, 3.9, 3.10, 3.11, 3.12, and 3.13) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
 
 ## Installation
 

ci/datasources/runtimes.yaml

@@ -39,3 +39,11 @@ runtimes:
     python_version: "3.12"
     arch: "arm64"
     image: "3.12.0"
+  - name: "python313"
+    python_version: "3.13"
+    arch: "amd64"
+    image: "3.13.0"
+  - name: "python313"
+    python_version: "3.13"
+    arch: "arm64"
+    image: "3.13.0"

ci/publish_layers.sh

@@ -21,8 +21,10 @@ AWS_CLI_PYTHON_VERSIONS=(
     "python3.11"
     "python3.12"
     "python3.12"
+    "python3.13"
+    "python3.13"
 )
-PYTHON_VERSIONS=("3.8-amd64" "3.8-arm64" "3.9-amd64" "3.9-arm64" "3.10-amd64" "3.10-arm64" "3.11-amd64" "3.11-arm64" "3.12-amd64" "3.12-arm64")
+PYTHON_VERSIONS=("3.8-amd64" "3.8-arm64" "3.9-amd64" "3.9-arm64" "3.10-amd64" "3.10-arm64" "3.11-amd64" "3.11-arm64" "3.12-amd64" "3.12-arm64" "3.13-amd64" "3.13-arm64")
 LAYER_PATHS=(
     ".layers/datadog_lambda_py-amd64-3.8.zip"
     ".layers/datadog_lambda_py-arm64-3.8.zip"
@@ -34,6 +36,8 @@ LAYER_PATHS=(
     ".layers/datadog_lambda_py-arm64-3.11.zip"
     ".layers/datadog_lambda_py-amd64-3.12.zip"
     ".layers/datadog_lambda_py-arm64-3.12.zip"
+    ".layers/datadog_lambda_py-amd64-3.13.zip"
+    ".layers/datadog_lambda_py-arm64-3.13.zip"
 )
 LAYERS=(
     "Datadog-Python38"
@@ -46,6 +50,8 @@ LAYERS=(
     "Datadog-Python311-ARM"
     "Datadog-Python312"
     "Datadog-Python312-ARM"
+    "Datadog-Python313"
+    "Datadog-Python313-ARM"
 )
 STAGES=('prod', 'sandbox', 'staging')
 

poetry.lock

@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 
 [tool.poetry.dependencies]

pyproject.toml

@@ -23,6 +23,8 @@ LAYER_NAMES=(
     "Datadog-Python311-ARM"
     "Datadog-Python312"
     "Datadog-Python312-ARM"
+    "Datadog-Python313"
+    "Datadog-Python313-ARM"
 )
 PYTHON_VERSIONS_FOR_AWS_CLI=(
     "python3.8"
@@ -35,6 +37,8 @@ PYTHON_VERSIONS_FOR_AWS_CLI=(
     "python3.11"
     "python3.12"
     "python3.12"
+    "python3.13"
+    "python3.13"
 )
 NEW_REGION=$1
 

scripts/add_new_region.sh

@@ -14,7 +14,7 @@ set -e
 
 LAYER_DIR=".layers"
 LAYER_FILES_PREFIX="datadog_lambda_py"
-AVAILABLE_PYTHON_VERSIONS=("3.8" "3.9" "3.10" "3.11" "3.12")
+AVAILABLE_PYTHON_VERSIONS=("3.8" "3.9" "3.10" "3.11" "3.12" "3.13")
 AVAILABLE_ARCHS=("arm64" "amd64")
 
 if [ -z "$ARCH" ]; then
@@ -61,7 +61,7 @@ function docker_build_zip {
     # between different python runtimes.
     temp_dir=$(mktemp -d)
     docker buildx build -t datadog-lambda-python-${arch}:$1 . --no-cache \
-        --build-arg image=python:$1 \
+        --build-arg image=public.ecr.aws/docker/library/python:$1 \
         --build-arg runtime=python$1 \
         --platform linux/${arch} \
         --progress=plain \

scripts/build_layers.sh

@@ -21,6 +21,8 @@ LAYER_NAMES=(
     "Datadog-Python311-ARM"
     "Datadog-Python312"
     "Datadog-Python312-ARM"
+    "Datadog-Python313"
+    "Datadog-Python313-ARM"
 )
 AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName')
 LAYERS_MISSING_REGIONS=()

scripts/list_layers.sh

@@ -24,6 +24,8 @@ PYTHON_VERSIONS_FOR_AWS_CLI=(
     "python3.11"
     "python3.12"
     "python3.12"
+    "python3.13"
+    "python3.13"
 )
 LAYER_PATHS=(
     ".layers/datadog_lambda_py-amd64-3.8.zip"
@@ -36,6 +38,8 @@ LAYER_PATHS=(
     ".layers/datadog_lambda_py-arm64-3.11.zip"
     ".layers/datadog_lambda_py-amd64-3.12.zip"
     ".layers/datadog_lambda_py-arm64-3.12.zip"
+    ".layers/datadog_lambda_py-amd64-3.13.zip"
+    ".layers/datadog_lambda_py-arm64-3.13.zip"
 )
 AVAILABLE_LAYERS=(
     "Datadog-Python38"
@@ -48,6 +52,8 @@ AVAILABLE_LAYERS=(
     "Datadog-Python311-ARM"
     "Datadog-Python312"
     "Datadog-Python312-ARM"
+    "Datadog-Python313"
+    "Datadog-Python313-ARM"
 )
 AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName')
 

scripts/publish_layers.sh

@@ -32,8 +32,9 @@ python39=("python3.9" "3.9" $(xxd -l 4 -c 4 -p < /dev/random))
 python310=("python3.10" "3.10" $(xxd -l 4 -c 4 -p < /dev/random))
 python311=("python3.11" "3.11" $(xxd -l 4 -c 4 -p < /dev/random))
 python312=("python3.12" "3.12" $(xxd -l 4 -c 4 -p < /dev/random))
+python313=("python3.13" "3.13" $(xxd -l 4 -c 4 -p < /dev/random))
 
-PARAMETERS_SETS=("python38" "python39" "python310" "python311" "python312")
+PARAMETERS_SETS=("python38" "python39" "python310" "python311" "python312" "python313")
 
 if [ -z "$RUNTIME_PARAM" ]; then
     echo "Python version not specified, running for all python versions."

scripts/run_integration_tests.sh

@@ -8,7 +8,7 @@
 # Run unit tests in Docker
 set -e
 
-PYTHON_VERSIONS=("3.8" "3.9" "3.10" "3.11" "3.12")
+PYTHON_VERSIONS=("3.8" "3.9" "3.10" "3.11" "3.12" "3.13")
 
 for python_version in "${PYTHON_VERSIONS[@]}"
 do

scripts/run_tests.sh

@@ -19,6 +19,8 @@ LAYER_FILES=(
     "datadog_lambda_py-arm64-3.11.zip"
     "datadog_lambda_py-amd64-3.12.zip"
     "datadog_lambda_py-arm64-3.12.zip"
+    "datadog_lambda_py-amd64-3.13.zip"
+    "datadog_lambda_py-arm64-3.13.zip"
 )
 SIGNING_PROFILE_NAME="DatadogLambdaSigningProfile"
 

scripts/sign_layers.sh

@@ -1,5 +1,5 @@
 ARG python_version
-FROM python:$python_version
+FROM public.ecr.aws/docker/library/python:$python_version
 
 ENV PYTHONDONTWRITEBYTECODE True