feat: support Python 3.11 (#355)

duncanista · astuyve · joeyzhao2018 · web-flow · commit 5951821ecd72 · 2023-07-27T23:15:31.000-04:00
* update scripts
* update gh actions
* update `pyproject.toml`
* update `README.md`
* add snapshots
* fix: ints
* fix the potential circular import

---------

Co-authored-by: AJ Stuyvenberg &lt;astuyve@gmail.com&gt;
Co-authored-by: Joey Zhao &lt;5253430+joeyzhao2018@users.noreply.github.com&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
       - name: Checkout
@@ -68,7 +68,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        runtime-param: ['3.7', '3.8', '3.9', '3.10']
+        runtime-param: ['3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/README.md b/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.7, 3.8, 3.9, and 3.10) 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.7, 3.8, 3.9, 3.10, and 3.11) 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
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,6 +20,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 
 [tool.poetry.dependencies]
diff --git a/scripts/add_new_region.sh b/scripts/add_new_region.sh
@@ -12,8 +12,8 @@ set -e
 
 OLD_REGION='us-east-1'
 
-LAYER_NAMES=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM" "Datadog-Python310" "Datadog-Python310-ARM")
-PYTHON_VERSIONS_FOR_AWS_CLI=("python3.7" "python3.8" "python3.8" "python3.9" "python3.9" "python3.10" "python3.10")
+LAYER_NAMES=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM" "Datadog-Python310" "Datadog-Python310-ARM" "Datadog-Python311" "Datadog-Python311-ARM")
+PYTHON_VERSIONS_FOR_AWS_CLI=("python3.7" "python3.8" "python3.8" "python3.9" "python3.9" "python3.10" "python3.10" "python3.11" "python3.11")
 NEW_REGION=$1
 
 publish_layer() {
diff --git a/scripts/build_layers.sh b/scripts/build_layers.sh
@@ -14,7 +14,7 @@ set -e
 
 LAYER_DIR=".layers"
 LAYER_FILES_PREFIX="datadog_lambda_py"
-AVAILABLE_PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10")
+AVAILABLE_PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11")
 
 # Determine which Python versions to build layers for
 if [ -z "$PYTHON_VERSION" ]; then
diff --git a/scripts/check_layer_size.sh b/scripts/check_layer_size.sh
@@ -14,7 +14,7 @@ MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 24 \* 1024)
 
 LAYER_FILES_PREFIX="datadog_lambda_py"
 LAYER_DIR=".layers"
-VERSIONS=("3.7" "3.8" "3.9" "3.10")
+VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11")
 
 for version in "${VERSIONS[@]}"
 do
diff --git a/scripts/list_layers.sh b/scripts/list_layers.sh
@@ -10,7 +10,7 @@
 
 set -e
 
-LAYER_NAMES=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM" "Datadog-Python310" "Datadog-Python310-ARM")
+LAYER_NAMES=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM" "Datadog-Python310" "Datadog-Python310-ARM" "Datadog-Python311" "Datadog-Python311-ARM")
 AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName')
 LAYERS_MISSING_REGIONS=()
 
diff --git a/scripts/publish_layers.sh b/scripts/publish_layers.sh
@@ -13,10 +13,10 @@ set -e
 # Makes sure any subprocesses will be terminated with this process
 trap "pkill -P $$; exit 1;" INT
 
-PYTHON_VERSIONS_FOR_AWS_CLI=("python3.7" "python3.8" "python3.8" "python3.9" "python3.9" "python3.10" "python3.10")
-LAYER_PATHS=(".layers/datadog_lambda_py-amd64-3.7.zip" ".layers/datadog_lambda_py-amd64-3.8.zip" ".layers/datadog_lambda_py-arm64-3.8.zip" ".layers/datadog_lambda_py-amd64-3.9.zip" ".layers/datadog_lambda_py-arm64-3.9.zip" ".layers/datadog_lambda_py-amd64-3.10.zip" ".layers/datadog_lambda_py-arm64-3.10.zip")
-AVAILABLE_LAYERS=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM" "Datadog-Python310" "Datadog-Python310-ARM")
-ARCHS=("amd64" "amd64" "amd64""amd64" "amd64" "arm64" "amd64" "arm64")
+PYTHON_VERSIONS_FOR_AWS_CLI=("python3.7" "python3.8" "python3.8" "python3.9" "python3.9" "python3.10" "python3.10" "python3.11" "python3.11")
+LAYER_PATHS=(".layers/datadog_lambda_py-amd64-3.7.zip" ".layers/datadog_lambda_py-amd64-3.8.zip" ".layers/datadog_lambda_py-arm64-3.8.zip" ".layers/datadog_lambda_py-amd64-3.9.zip" ".layers/datadog_lambda_py-arm64-3.9.zip" ".layers/datadog_lambda_py-amd64-3.10.zip" ".layers/datadog_lambda_py-arm64-3.10.zip" ".layers/datadog_lambda_py-amd64-3.11.zip" ".layers/datadog_lambda_py-arm64-3.11.zip")
+AVAILABLE_LAYERS=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM" "Datadog-Python310" "Datadog-Python310-ARM" "Datadog-Python311" "Datadog-Python311-ARM")
+ARCHS=("amd64" "amd64" "amd64""amd64" "amd64" "arm64" "amd64" "arm64" "amd64" "arm64")
 AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName')
 
 # Check that the layer files exist
diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh
@@ -11,7 +11,7 @@ set -e
 # These values need to be in sync with serverless.yml, where there needs to be a function
 # defined for every handler_runtime combination
 LAMBDA_HANDLERS=("async-metrics" "sync-metrics")
-RUNTIMES=("python37" "python38" "python39" "python310")
+RUNTIMES=("python37" "python38" "python39" "python310" "python311")
 
 LOGS_WAIT_SECONDS=20
 
@@ -32,8 +32,9 @@ python37=("python3.7" "3.7" $(xxd -l 4 -c 4 -p < /dev/random))
 python38=("python3.8" "3.8" $(xxd -l 4 -c 4 -p < /dev/random))
 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))
 
-PARAMETERS_SETS=("python37" "python38" "python39" "python310")
+PARAMETERS_SETS=("python37" "python38" "python39" "python310" "python311")
 
 if [ -z "$RUNTIME_PARAM" ]; then
     echo "Python version not specified, running for all python versions."
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
@@ -8,7 +8,7 @@
 # Run unit tests in Docker
 set -e
 
-PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10")
+PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11")
 
 for python_version in "${PYTHON_VERSIONS[@]}"
 do
diff --git a/scripts/sign_layers.sh b/scripts/sign_layers.sh
@@ -16,6 +16,8 @@ LAYER_FILES=(
     "datadog_lambda_py-arm64-3.9.zip"
     "datadog_lambda_py-amd64-3.10.zip"
     "datadog_lambda_py-arm64-3.10.zip"
+    "datadog_lambda_py-amd64-3.11.zip"
+    "datadog_lambda_py-arm64-3.11.zip"
 )
 SIGNING_PROFILE_NAME="DatadogLambdaSigningProfile"
 
diff --git a/tests/integration/snapshots/logs/async-metrics_python311.log b/tests/integration/snapshots/logs/async-metrics_python311.log
diff --git a/tests/integration/snapshots/logs/sync-metrics_python311.log b/tests/integration/snapshots/logs/sync-metrics_python311.log
diff --git a/tests/test_tracing.py b/tests/test_tracing.py

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ classifiers = [`
`20`	`20`	`"Programming Language :: Python :: 3.8",`
`21`	`21`	`"Programming Language :: Python :: 3.9",`
`22`	`22`	`"Programming Language :: Python :: 3.10",`
	`23`	`+ "Programming Language :: Python :: 3.11",`
`23`	`24`	`]`
`24`	`25`
`25`	`26`	`[tool.poetry.dependencies]`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ LAYER_FILES=(`
`16`	`16`	`"datadog_lambda_py-arm64-3.9.zip"`
`17`	`17`	`"datadog_lambda_py-amd64-3.10.zip"`
`18`	`18`	`"datadog_lambda_py-arm64-3.10.zip"`
	`19`	`+ "datadog_lambda_py-amd64-3.11.zip"`
	`20`	`+ "datadog_lambda_py-arm64-3.11.zip"`
`19`	`21`	`)`
`20`	`22`	`SIGNING_PROFILE_NAME="DatadogLambdaSigningProfile"`
`21`	`23`